| 1 |
commit: 0816769373e7ee62685158b65f7cfde287e5d936 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 19:41:38 2022 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 20:04:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08167693 |
| 7 |
|
| 8 |
app-editors/vim: depend on vim-core unconditionally |
| 9 |
|
| 10 |
We need it for defaults.vim, which cannot be owned by 2 packages |
| 11 |
simultaneously. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/834498 |
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 16 |
|
| 17 |
.../vim/{vim-8.2.4328.ebuild => vim-8.2.4328-r1.ebuild} | 11 ++--------- |
| 18 |
app-editors/vim/vim-9999.ebuild | 11 ++--------- |
| 19 |
2 files changed, 4 insertions(+), 18 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-editors/vim/vim-8.2.4328.ebuild b/app-editors/vim/vim-8.2.4328-r1.ebuild |
| 22 |
similarity index 97% |
| 23 |
rename from app-editors/vim/vim-8.2.4328.ebuild |
| 24 |
rename to app-editors/vim/vim-8.2.4328-r1.ebuild |
| 25 |
index 2b7c3b0992cc..5d9a0aae046a 100644 |
| 26 |
--- a/app-editors/vim/vim-8.2.4328.ebuild |
| 27 |
+++ b/app-editors/vim/vim-8.2.4328-r1.ebuild |
| 28 |
@@ -45,7 +45,8 @@ RDEPEND=" |
| 29 |
lua? ( ${LUA_DEPS} |
| 30 |
$(lua_gen_impl_dep 'deprecated' lua5-1) |
| 31 |
) |
| 32 |
- !minimal? ( ~app-editors/vim-core-${PV} ) |
| 33 |
+ ~app-editors/vim-core-${PV} |
| 34 |
+ !<app-editors/vim-core-8.2.4328-r1 |
| 35 |
vim-pager? ( app-editors/vim-core[-minimal] ) |
| 36 |
perl? ( dev-lang/perl:= ) |
| 37 |
python? ( ${PYTHON_DEPS} ) |
| 38 |
@@ -318,14 +319,6 @@ src_install() { |
| 39 |
fperms a+x ${vimfiles}/macros/manpager.sh |
| 40 |
fi |
| 41 |
|
| 42 |
- # Fix an issue of missing defaults.vim when USE=minimal. |
| 43 |
- if use minimal ; then |
| 44 |
- if [[ ! -f "${vimfiles}/defaults.vim" ]]; then |
| 45 |
- insinto ${vimfiles} |
| 46 |
- doins runtime/defaults.vim |
| 47 |
- fi |
| 48 |
- fi |
| 49 |
- |
| 50 |
domenu runtime/vim.desktop |
| 51 |
|
| 52 |
newbashcomp "${FILESDIR}"/${PN}-completion ${PN} |
| 53 |
|
| 54 |
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild |
| 55 |
index 2b7c3b0992cc..5d9a0aae046a 100644 |
| 56 |
--- a/app-editors/vim/vim-9999.ebuild |
| 57 |
+++ b/app-editors/vim/vim-9999.ebuild |
| 58 |
@@ -45,7 +45,8 @@ RDEPEND=" |
| 59 |
lua? ( ${LUA_DEPS} |
| 60 |
$(lua_gen_impl_dep 'deprecated' lua5-1) |
| 61 |
) |
| 62 |
- !minimal? ( ~app-editors/vim-core-${PV} ) |
| 63 |
+ ~app-editors/vim-core-${PV} |
| 64 |
+ !<app-editors/vim-core-8.2.4328-r1 |
| 65 |
vim-pager? ( app-editors/vim-core[-minimal] ) |
| 66 |
perl? ( dev-lang/perl:= ) |
| 67 |
python? ( ${PYTHON_DEPS} ) |
| 68 |
@@ -318,14 +319,6 @@ src_install() { |
| 69 |
fperms a+x ${vimfiles}/macros/manpager.sh |
| 70 |
fi |
| 71 |
|
| 72 |
- # Fix an issue of missing defaults.vim when USE=minimal. |
| 73 |
- if use minimal ; then |
| 74 |
- if [[ ! -f "${vimfiles}/defaults.vim" ]]; then |
| 75 |
- insinto ${vimfiles} |
| 76 |
- doins runtime/defaults.vim |
| 77 |
- fi |
| 78 |
- fi |
| 79 |
- |
| 80 |
domenu runtime/vim.desktop |
| 81 |
|
| 82 |
newbashcomp "${FILESDIR}"/${PN}-completion ${PN} |
Archives