| 1 |
commit: 26a1674ea8c5535a273f6b404becd7c8d90f4c5a |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 2 19:33:36 2022 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 2 20:04:54 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a1674e |
| 7 |
|
| 8 |
app-editors/vim-core: always install defaults.vim. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/834498 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/24390 |
| 13 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{vim-core-8.2.4328.ebuild => vim-core-8.2.4328-r1.ebuild} | 10 ++-------- |
| 16 |
app-editors/vim-core/vim-core-9999.ebuild | 10 ++-------- |
| 17 |
2 files changed, 4 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
similarity index 95% |
| 21 |
rename from app-editors/vim-core/vim-core-8.2.4328.ebuild |
| 22 |
rename to app-editors/vim-core/vim-core-8.2.4328-r1.ebuild |
| 23 |
index eda637ba36f0..37b1be63841c 100644 |
| 24 |
--- a/app-editors/vim-core/vim-core-8.2.4328.ebuild |
| 25 |
+++ b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild |
| 26 |
@@ -28,7 +28,8 @@ IUSE="nls acl minimal" |
| 27 |
|
| 28 |
BDEPEND="sys-devel/autoconf" |
| 29 |
# Avoid icon file collision, bug #673880 |
| 30 |
-RDEPEND="!!<app-editors/gvim-8.1.0648" |
| 31 |
+RDEPEND="!!<app-editors/gvim-8.1.0648 |
| 32 |
+ !<app-editors/vim-8.2.4328-r1" |
| 33 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
| 34 |
|
| 35 |
pkg_setup() { |
| 36 |
@@ -207,13 +208,6 @@ src_install() { |
| 37 |
eshopts_pop |
| 38 |
fi |
| 39 |
|
| 40 |
- # Delete defaults.vim to avoid conflicts with one from vim. |
| 41 |
- # If defaults.vim already exists in files installed from vim, |
| 42 |
- # do not install defaults.vim. |
| 43 |
- if [[ -f "${vimfiles}/defaults.vim" ]]; then |
| 44 |
- rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 45 |
- fi |
| 46 |
- |
| 47 |
newbashcomp "${FILESDIR}"/xxd-completion xxd |
| 48 |
|
| 49 |
# install gvim icon since both vim/gvim desktop files reference it |
| 50 |
|
| 51 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild |
| 52 |
index eda637ba36f0..37b1be63841c 100644 |
| 53 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
| 54 |
+++ b/app-editors/vim-core/vim-core-9999.ebuild |
| 55 |
@@ -28,7 +28,8 @@ IUSE="nls acl minimal" |
| 56 |
|
| 57 |
BDEPEND="sys-devel/autoconf" |
| 58 |
# Avoid icon file collision, bug #673880 |
| 59 |
-RDEPEND="!!<app-editors/gvim-8.1.0648" |
| 60 |
+RDEPEND="!!<app-editors/gvim-8.1.0648 |
| 61 |
+ !<app-editors/vim-8.2.4328-r1" |
| 62 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
| 63 |
|
| 64 |
pkg_setup() { |
| 65 |
@@ -207,13 +208,6 @@ src_install() { |
| 66 |
eshopts_pop |
| 67 |
fi |
| 68 |
|
| 69 |
- # Delete defaults.vim to avoid conflicts with one from vim. |
| 70 |
- # If defaults.vim already exists in files installed from vim, |
| 71 |
- # do not install defaults.vim. |
| 72 |
- if [[ -f "${vimfiles}/defaults.vim" ]]; then |
| 73 |
- rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" |
| 74 |
- fi |
| 75 |
- |
| 76 |
newbashcomp "${FILESDIR}"/xxd-completion xxd |
| 77 |
|
| 78 |
# install gvim icon since both vim/gvim desktop files reference it |
Archives