diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild index 7cccceadd8e42..5c1fb6f93cb39 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild @@ -191,6 +191,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -199,6 +202,9 @@ src_install() { keep_syntax="${keep_syntax}|syntax|nosyntax|synload" ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + eshopts_pop fi diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild index c52a926b699e4..40e298a032ae8 100644 --- a/app-editors/vim-core/vim-core-8.2.3428.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3428.ebuild @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { keep_syntax="${keep_syntax}|syntax|nosyntax|synload" ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + eshopts_pop fi diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild index 7e80dc2f16f9f..a6ac59db33c34 100644 --- a/app-editors/vim-core/vim-core-8.2.3567.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3567.ebuild @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { keep_syntax="${keep_syntax}|syntax|nosyntax|synload" ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + eshopts_pop fi diff --git a/app-editors/vim-core/vim-core-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild index 8846e2787bfab..7c85269220f91 100644 --- a/app-editors/vim-core/vim-core-8.2.3582.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3582.ebuild @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { keep_syntax="${keep_syntax}|syntax|nosyntax|synload" ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + eshopts_pop fi diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index 7e80dc2f16f9f..a6ac59db33c34 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -193,6 +193,9 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + # Delete defaults.vim to avoid conflicts with one from vim[minimal] + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -201,6 +204,9 @@ src_install() { keep_syntax="${keep_syntax}|syntax|nosyntax|synload" ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + eshopts_pop fi