commit: 26a1674ea8c5535a273f6b404becd7c8d90f4c5a Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Mar 2 19:33:36 2022 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Mar 2 20:04:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a1674e
app-editors/vim-core: always install defaults.vim. Bug: https://bugs.gentoo.org/834498 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24390 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../{vim-core-8.2.4328.ebuild => vim-core-8.2.4328-r1.ebuild} | 10 ++-------- app-editors/vim-core/vim-core-9999.ebuild | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/app-editors/vim-core/vim-core-8.2.4328.ebuild b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild similarity index 95% rename from app-editors/vim-core/vim-core-8.2.4328.ebuild rename to app-editors/vim-core/vim-core-8.2.4328-r1.ebuild index eda637ba36f0..37b1be63841c 100644 --- a/app-editors/vim-core/vim-core-8.2.4328.ebuild +++ b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild @@ -28,7 +28,8 @@ IUSE="nls acl minimal" BDEPEND="sys-devel/autoconf" # Avoid icon file collision, bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" +RDEPEND="!!<app-editors/gvim-8.1.0648 + !<app-editors/vim-8.2.4328-r1" PDEPEND="!minimal? ( app-vim/gentoo-syntax )" pkg_setup() { @@ -207,13 +208,6 @@ src_install() { eshopts_pop fi - # Delete defaults.vim to avoid conflicts with one from vim. - # If defaults.vim already exists in files installed from vim, - # do not install defaults.vim. - if [[ -f "${vimfiles}/defaults.vim" ]]; then - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - fi - newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index eda637ba36f0..37b1be63841c 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -28,7 +28,8 @@ IUSE="nls acl minimal" BDEPEND="sys-devel/autoconf" # Avoid icon file collision, bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" +RDEPEND="!!<app-editors/gvim-8.1.0648 + !<app-editors/vim-8.2.4328-r1" PDEPEND="!minimal? ( app-vim/gentoo-syntax )" pkg_setup() { @@ -207,13 +208,6 @@ src_install() { eshopts_pop fi - # Delete defaults.vim to avoid conflicts with one from vim. - # If defaults.vim already exists in files installed from vim, - # do not install defaults.vim. - if [[ -f "${vimfiles}/defaults.vim" ]]; then - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - fi - newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it
