| 1 |
commit: e248f9bbf5563be7d6185fd146db364df83a9988 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 28 22:14:22 2018 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 28 22:24:08 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e248f9bb |
| 7 |
|
| 8 |
app-editors/vim-core: avoid icon file collision with gvim |
| 9 |
|
| 10 |
And update icon cache. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/673926 |
| 13 |
|
| 14 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 15 |
|
| 16 |
app-editors/vim-core/vim-core-8.1.0648.ebuild | 12 ++++++++++-- |
| 17 |
app-editors/vim-core/vim-core-9999.ebuild | 12 ++++++++++-- |
| 18 |
2 files changed, 20 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-editors/vim-core/vim-core-8.1.0648.ebuild b/app-editors/vim-core/vim-core-8.1.0648.ebuild |
| 21 |
index 3c18feca903..1aeb3a66d54 100644 |
| 22 |
--- a/app-editors/vim-core/vim-core-8.1.0648.ebuild |
| 23 |
+++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild |
| 24 |
@@ -3,7 +3,7 @@ |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
VIM_VERSION="8.1" |
| 28 |
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop |
| 29 |
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils |
| 30 |
|
| 31 |
if [[ ${PV} == 9999* ]] ; then |
| 32 |
inherit git-r3 |
| 33 |
@@ -23,6 +23,8 @@ LICENSE="vim" |
| 34 |
IUSE="nls acl minimal" |
| 35 |
|
| 36 |
DEPEND="sys-devel/autoconf" |
| 37 |
+# avoid icon file collision bug #673880 |
| 38 |
+RDEPEND="!!<app-editors/gvim-8.1.0648" |
| 39 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
| 40 |
|
| 41 |
S=${WORKDIR}/vim-${PV} |
| 42 |
@@ -207,11 +209,17 @@ src_install() { |
| 43 |
} |
| 44 |
|
| 45 |
pkg_postinst() { |
| 46 |
- # Update documentation tags (from vim-doc.eclass) |
| 47 |
+ # update documentation tags (from vim-doc.eclass) |
| 48 |
update_vim_helptags |
| 49 |
+ |
| 50 |
+ # update icon cache |
| 51 |
+ gnome2_icon_cache_update |
| 52 |
} |
| 53 |
|
| 54 |
pkg_postrm() { |
| 55 |
# Update documentation tags (from vim-doc.eclass) |
| 56 |
update_vim_helptags |
| 57 |
+ |
| 58 |
+ # update icon cache |
| 59 |
+ gnome2_icon_cache_update |
| 60 |
} |
| 61 |
|
| 62 |
diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild |
| 63 |
index 3c18feca903..1aeb3a66d54 100644 |
| 64 |
--- a/app-editors/vim-core/vim-core-9999.ebuild |
| 65 |
+++ b/app-editors/vim-core/vim-core-9999.ebuild |
| 66 |
@@ -3,7 +3,7 @@ |
| 67 |
|
| 68 |
EAPI=6 |
| 69 |
VIM_VERSION="8.1" |
| 70 |
-inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop |
| 71 |
+inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils |
| 72 |
|
| 73 |
if [[ ${PV} == 9999* ]] ; then |
| 74 |
inherit git-r3 |
| 75 |
@@ -23,6 +23,8 @@ LICENSE="vim" |
| 76 |
IUSE="nls acl minimal" |
| 77 |
|
| 78 |
DEPEND="sys-devel/autoconf" |
| 79 |
+# avoid icon file collision bug #673880 |
| 80 |
+RDEPEND="!!<app-editors/gvim-8.1.0648" |
| 81 |
PDEPEND="!minimal? ( app-vim/gentoo-syntax )" |
| 82 |
|
| 83 |
S=${WORKDIR}/vim-${PV} |
| 84 |
@@ -207,11 +209,17 @@ src_install() { |
| 85 |
} |
| 86 |
|
| 87 |
pkg_postinst() { |
| 88 |
- # Update documentation tags (from vim-doc.eclass) |
| 89 |
+ # update documentation tags (from vim-doc.eclass) |
| 90 |
update_vim_helptags |
| 91 |
+ |
| 92 |
+ # update icon cache |
| 93 |
+ gnome2_icon_cache_update |
| 94 |
} |
| 95 |
|
| 96 |
pkg_postrm() { |
| 97 |
# Update documentation tags (from vim-doc.eclass) |
| 98 |
update_vim_helptags |
| 99 |
+ |
| 100 |
+ # update icon cache |
| 101 |
+ gnome2_icon_cache_update |
| 102 |
} |
Archives