diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-03-02 14:33:36 -0500 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2022-03-02 21:04:54 +0100 |
| commit | 26a1674ea8c5535a273f6b404becd7c8d90f4c5a (patch) | |
| tree | 6b396325e00336cba9c8066583abd46072f568b9 | |
| parent | app-emacs/csharp-mode: install important files (diff) | |
| download | gentoo-26a1674e.tar.gz gentoo-26a1674e.tar.bz2 gentoo-26a1674e.zip | |
app-editors/vim-core: always install defaults.vim.
Bug: https://bugs.gentoo.org/834498
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/24390
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
| -rw-r--r-- | app-editors/vim-core/vim-core-8.2.4328-r1.ebuild (renamed from app-editors/vim-core/vim-core-8.2.4328.ebuild) | 10 | ||||
| -rw-r--r-- | 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 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 |