commit:     fc72192754c8a1ff9014fd739a2d07056b25ed1e
Author:     Dongsu Park <dpark <AT> linux <DOT> microsoft <DOT> com>
AuthorDate: Mon Nov 29 15:59:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 17:06:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc721927

app-editors/vim: remove warning due to missing defaults.vim

vim >= 8.2.3428 prints out a warning on missing file, when
it is built with USE="minimal" and `app-editors/vim-core` is not
installed.

```
$ vim
E1187: Failed to source defaults.vim
Press ENTER or type command to continue
```

To remove warning, explicitly install /usr/share/vim/vim82/defaults.vim.

Closes: https://bugs.gentoo.org/820356
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.0814-r100.ebuild | 6 ++++++
 app-editors/vim/vim-8.2.3428-r1.ebuild   | 6 ++++++
 app-editors/vim/vim-8.2.3567.ebuild      | 6 ++++++
 app-editors/vim/vim-8.2.3582.ebuild      | 6 ++++++
 app-editors/vim/vim-9999.ebuild          | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild 
b/app-editors/vim/vim-8.2.0814-r100.ebuild
index edd131772b0f..0f20c926a800 100644
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@@ -304,6 +304,12 @@ src_install() {
                fperms a+x ${vimfiles}/macros/manpager.sh
        fi
 
+       # Fix an issue of missing defaults.vim when USE=minimal.
+       if use minimal ; then
+               insinto ${vimfiles}
+               doins runtime/defaults.vim
+       fi
+
        domenu runtime/vim.desktop
 
        newbashcomp "${FILESDIR}"/${PN}-completion ${PN}

diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild 
b/app-editors/vim/vim-8.2.3428-r1.ebuild
index d38b89a8bb5a..6a4b59f53ef1 100644
--- a/app-editors/vim/vim-8.2.3428-r1.ebuild
+++ b/app-editors/vim/vim-8.2.3428-r1.ebuild
@@ -316,6 +316,12 @@ src_install() {
                fperms a+x ${vimfiles}/macros/manpager.sh
        fi
 
+       # Fix an issue of missing defaults.vim when USE=minimal.
+       if use minimal ; then
+               insinto ${vimfiles}
+               doins runtime/defaults.vim
+       fi
+
        domenu runtime/vim.desktop
 
        newbashcomp "${FILESDIR}"/${PN}-completion ${PN}

diff --git a/app-editors/vim/vim-8.2.3567.ebuild 
b/app-editors/vim/vim-8.2.3567.ebuild
index bdfd543c08a4..3ce917bf8851 100644
--- a/app-editors/vim/vim-8.2.3567.ebuild
+++ b/app-editors/vim/vim-8.2.3567.ebuild
@@ -318,6 +318,12 @@ src_install() {
                fperms a+x ${vimfiles}/macros/manpager.sh
        fi
 
+       # Fix an issue of missing defaults.vim when USE=minimal.
+       if use minimal ; then
+               insinto ${vimfiles}
+               doins runtime/defaults.vim
+       fi
+
        domenu runtime/vim.desktop
 
        newbashcomp "${FILESDIR}"/${PN}-completion ${PN}

diff --git a/app-editors/vim/vim-8.2.3582.ebuild 
b/app-editors/vim/vim-8.2.3582.ebuild
index 84b805495f27..cf406ca4b069 100644
--- a/app-editors/vim/vim-8.2.3582.ebuild
+++ b/app-editors/vim/vim-8.2.3582.ebuild
@@ -318,6 +318,12 @@ src_install() {
                fperms a+x ${vimfiles}/macros/manpager.sh
        fi
 
+       # Fix an issue of missing defaults.vim when USE=minimal.
+       if use minimal ; then
+               insinto ${vimfiles}
+               doins runtime/defaults.vim
+       fi
+
        domenu runtime/vim.desktop
 
        newbashcomp "${FILESDIR}"/${PN}-completion ${PN}

diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
index bdfd543c08a4..3ce917bf8851 100644
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@@ -318,6 +318,12 @@ src_install() {
                fperms a+x ${vimfiles}/macros/manpager.sh
        fi
 
+       # Fix an issue of missing defaults.vim when USE=minimal.
+       if use minimal ; then
+               insinto ${vimfiles}
+               doins runtime/defaults.vim
+       fi
+
        domenu runtime/vim.desktop
 
        newbashcomp "${FILESDIR}"/${PN}-completion ${PN}

Reply via email to