1 |
commit: 1b183b8fb6e5c0ce2265265556fe5d061b959f79 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 10 19:37:21 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 11 17:14:13 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b183b8f |
7 |
|
8 |
gnome2-utils: Don't provide icon cache functions with EAPI-7 |
9 |
|
10 |
They are in xdg-utils now, so EAPI-7 bump is a good time to move over |
11 |
to the xdg versions by those that need it. |
12 |
|
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
|
15 |
eclass/gnome2-utils.eclass | 50 ++++++++++++++++++++++++++-------------------- |
16 |
1 file changed, 28 insertions(+), 22 deletions(-) |
17 |
|
18 |
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass |
19 |
index 41b3edbcd9b..8ba576aab8c 100644 |
20 |
--- a/eclass/gnome2-utils.eclass |
21 |
+++ b/eclass/gnome2-utils.eclass |
22 |
@@ -198,28 +198,6 @@ gnome2_gconf_uninstall() { |
23 |
fi |
24 |
} |
25 |
|
26 |
-# @FUNCTION: gnome2_icon_savelist |
27 |
-# @DESCRIPTION: |
28 |
-# Find the icons that are about to be installed and save their location |
29 |
-# in the GNOME2_ECLASS_ICONS environment variable. This is only |
30 |
-# necessary for eclass implementations that call |
31 |
-# gnome2_icon_cache_update conditionally. |
32 |
-# This function should be called from pkg_preinst. |
33 |
-gnome2_icon_savelist() { |
34 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
35 |
- pushd "${ED}" > /dev/null || die |
36 |
- export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) |
37 |
- popd > /dev/null || die |
38 |
-} |
39 |
- |
40 |
-# @FUNCTION: gnome2_icon_cache_update |
41 |
-# @DESCRIPTION: |
42 |
-# Updates Gtk+ icon cache files under /usr/share/icons. |
43 |
-# Deprecated. Please use xdg_icon_cache_update from xdg-utils.eclass |
44 |
-gnome2_icon_cache_update() { |
45 |
- xdg_icon_cache_update |
46 |
-} |
47 |
- |
48 |
# @FUNCTION: gnome2_omf_fix |
49 |
# @DESCRIPTION: |
50 |
# Workaround applied to Makefile rules in order to remove redundant |
51 |
@@ -472,3 +450,31 @@ gnome2_disable_deprecation_warning() { |
52 |
ewarn "Failed to disable deprecation warnings in ${makefile}" |
53 |
done |
54 |
} |
55 |
+ |
56 |
+case ${EAPI:-0} in |
57 |
+0|1|2|3|4|5|6) |
58 |
+ |
59 |
+# @FUNCTION: gnome2_icon_savelist |
60 |
+# @DESCRIPTION: |
61 |
+# Find the icons that are about to be installed and save their location |
62 |
+# in the GNOME2_ECLASS_ICONS environment variable. This is only |
63 |
+# necessary for eclass implementations that call |
64 |
+# gnome2_icon_cache_update conditionally. |
65 |
+# This function should be called from pkg_preinst. |
66 |
+gnome2_icon_savelist() { |
67 |
+ has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
68 |
+ pushd "${ED}" > /dev/null || die |
69 |
+ export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) |
70 |
+ popd > /dev/null || die |
71 |
+} |
72 |
+ |
73 |
+# @FUNCTION: gnome2_icon_cache_update |
74 |
+# @DESCRIPTION: |
75 |
+# Updates Gtk+ icon cache files under /usr/share/icons. |
76 |
+# Deprecated. Please use xdg_icon_cache_update from xdg-utils.eclass |
77 |
+gnome2_icon_cache_update() { |
78 |
+ xdg_icon_cache_update |
79 |
+} |
80 |
+ |
81 |
+;; |
82 |
+esac |