commit: 74eaf6b7cbab24337eae5c07d42871aeb21a330e Author: Dongsu Park <dpark <AT> linux <DOT> microsoft <DOT> com> AuthorDate: Wed Dec 1 16:40:27 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 1 17:06:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eaf6b7
app-editors/vim-core: delete configs that conflict with vim[minimal] Delete skip_defaults_vim config options from /etc/vimrc, to avoid conflicts with vim[minimal]. Delete /usr/share/vim/vim82/defaults.vim, to avoid conflicts with vim[minimal]. Signed-off-by: Dongsu Park <dpark <AT> linux.microsoft.com> Closes: https://github.com/gentoo/gentoo/pull/23115 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/vim-core/vim-core-8.2.0814.ebuild | 6 ++++++ app-editors/vim-core/vim-core-8.2.3428.ebuild | 6 ++++++ app-editors/vim-core/vim-core-8.2.3567.ebuild | 6 ++++++ app-editors/vim-core/vim-core-8.2.3582.ebuild | 6 ++++++ app-editors/vim-core/vim-core-9999.ebuild | 6 ++++++ 5 files changed, 30 insertions(+) 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 7cccceadd8e4..5c1fb6f93cb3 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 c52a926b699e..40e298a032ae 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 7e80dc2f16f9..a6ac59db33c3 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 8846e2787bfa..7c85269220f9 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 7e80dc2f16f9..a6ac59db33c3 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
