[gentoo-commits] repo/gentoo:master commit in: app-editors/vim/

[Sam James]

commit:     90d47914d37a74bf090f7c5fab43bb8f5084b9ae
Author:     Dongsu Park <dpark <AT> linux <DOT> microsoft <DOT> com>
AuthorDate: Fri Feb 18 11:27:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 17:56:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d47914

app-editors/vim: fix conflicts in 8.2.{4285,4328}

We fixed defaults.vim installation conflicts in
49adc5f0272e40ac608a89d268ee12811fcca384, but not for 8.2.4285 and
8.2.4328. Fix the issue for the versions.

Bug: https://bugs.gentoo.org/830177
Signed-off-by: Dongsu Park <dpark <AT> linux.microsoft.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/vim/vim-8.2.4285.ebuild | 6 ++++--
 app-editors/vim/vim-8.2.4328.ebuild | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app-editors/vim/vim-8.2.4285.ebuild 
b/app-editors/vim/vim-8.2.4285.ebuild
index a15f1260d55d..2b7c3b0992cc 100644
--- a/app-editors/vim/vim-8.2.4285.ebuild
+++ b/app-editors/vim/vim-8.2.4285.ebuild
@@ -320,8 +320,10 @@ src_install() {
 
        # Fix an issue of missing defaults.vim when USE=minimal.
        if use minimal ; then
-               insinto ${vimfiles}
-               doins runtime/defaults.vim
+               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+                       insinto ${vimfiles}
+                       doins runtime/defaults.vim
+               fi
        fi
 
        domenu runtime/vim.desktop

diff --git a/app-editors/vim/vim-8.2.4328.ebuild 
b/app-editors/vim/vim-8.2.4328.ebuild
index a15f1260d55d..2b7c3b0992cc 100644
--- a/app-editors/vim/vim-8.2.4328.ebuild
+++ b/app-editors/vim/vim-8.2.4328.ebuild
@@ -320,8 +320,10 @@ src_install() {
 
        # Fix an issue of missing defaults.vim when USE=minimal.
        if use minimal ; then
-               insinto ${vimfiles}
-               doins runtime/defaults.vim
+               if [[ ! -f "${vimfiles}/defaults.vim" ]]; then
+                       insinto ${vimfiles}
+                       doins runtime/defaults.vim
+               fi
        fi
 
        domenu runtime/vim.desktop