Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/
Date: Fri, 28 Dec 2018 22:25:38
Message-Id: 1546035849.60d656fac07ee43efbe05408cd5082a64612e883.radhermit@gentoo
1 commit: 60d656fac07ee43efbe05408cd5082a64612e883
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 28 22:18:24 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 28 22:24:09 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d656fa
7
8 app-editors/vim: drop unnecessary icon cache update
9
10 Icon is installed by vim-core which runs the cache update as well.
11
12 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
13
14 app-editors/vim/vim-8.1.0648.ebuild | 8 +++-----
15 app-editors/vim/vim-9999.ebuild | 8 +++-----
16 2 files changed, 6 insertions(+), 10 deletions(-)
17
18 diff --git a/app-editors/vim/vim-8.1.0648.ebuild b/app-editors/vim/vim-8.1.0648.ebuild
19 index abe19b7c71a..53057996e0d 100644
20 --- a/app-editors/vim/vim-8.1.0648.ebuild
21 +++ b/app-editors/vim/vim-8.1.0648.ebuild
22 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
23 PYTHON_REQ_USE="threads(+)"
24 USE_RUBY="ruby23 ruby24 ruby25"
25
26 -inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils gnome2-utils
27 +inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
28
29 if [[ ${PV} == 9999* ]] ; then
30 inherit git-r3
31 @@ -303,9 +303,8 @@ pkg_postinst() {
32 # Call eselect vi update
33 eselect_vi_update
34
35 - # update desktop file mime/icon caches
36 + # update desktop file mime cache
37 xdg_desktop_database_update
38 - gnome2_icon_cache_update
39 }
40
41 pkg_postrm() {
42 @@ -315,7 +314,6 @@ pkg_postrm() {
43 # Call eselect vi update
44 eselect_vi_update
45
46 - # update desktop file mime/icon caches
47 + # update desktop file mime cache
48 xdg_desktop_database_update
49 - gnome2_icon_cache_update
50 }
51
52 diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild
53 index abe19b7c71a..53057996e0d 100644
54 --- a/app-editors/vim/vim-9999.ebuild
55 +++ b/app-editors/vim/vim-9999.ebuild
56 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
57 PYTHON_REQ_USE="threads(+)"
58 USE_RUBY="ruby23 ruby24 ruby25"
59
60 -inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils gnome2-utils
61 +inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils
62
63 if [[ ${PV} == 9999* ]] ; then
64 inherit git-r3
65 @@ -303,9 +303,8 @@ pkg_postinst() {
66 # Call eselect vi update
67 eselect_vi_update
68
69 - # update desktop file mime/icon caches
70 + # update desktop file mime cache
71 xdg_desktop_database_update
72 - gnome2_icon_cache_update
73 }
74
75 pkg_postrm() {
76 @@ -315,7 +314,6 @@ pkg_postrm() {
77 # Call eselect vi update
78 eselect_vi_update
79
80 - # update desktop file mime/icon caches
81 + # update desktop file mime cache
82 xdg_desktop_database_update
83 - gnome2_icon_cache_update
84 }