1 |
Closes: https://bugs.gentoo.org/566728 |
2 |
Signed-off-by: Matt Turner <mattst88@g.o> |
3 |
--- |
4 |
eclass/gnome2-utils.eclass | 25 +++++++------------------ |
5 |
1 file changed, 7 insertions(+), 18 deletions(-) |
6 |
|
7 |
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass |
8 |
index 06643db0f60..bc1f8f20777 100644 |
9 |
--- a/eclass/gnome2-utils.eclass |
10 |
+++ b/eclass/gnome2-utils.eclass |
11 |
@@ -4,7 +4,7 @@ |
12 |
# @ECLASS: gnome2-utils.eclass |
13 |
# @MAINTAINER: |
14 |
# gnome@g.o |
15 |
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 |
16 |
+# @SUPPORTED_EAPIS: 5 6 7 |
17 |
# @BLURB: Auxiliary functions commonly used by Gnome packages. |
18 |
# @DESCRIPTION: |
19 |
# This eclass provides a set of auxiliary functions needed by most Gnome |
20 |
@@ -14,13 +14,13 @@ |
21 |
# * GConf schemas management |
22 |
# * scrollkeeper (old Gnome help system) management |
23 |
|
24 |
-[[ ${EAPI:-0} == [012345] ]] && inherit multilib |
25 |
+[[ ${EAPI} == 5 ]] && inherit multilib |
26 |
# eutils.eclass: emktemp |
27 |
# xdg-utils.eclass: xdg_environment_reset, xdg_icon_cache_update |
28 |
inherit eutils xdg-utils |
29 |
|
30 |
-case "${EAPI:-0}" in |
31 |
- 0|1|2|3|4|5|6|7) ;; |
32 |
+case ${EAPI} in |
33 |
+ 5|6|7) ;; |
34 |
*) die "EAPI=${EAPI} is not supported" ;; |
35 |
esac |
36 |
|
37 |
@@ -95,7 +95,7 @@ gnome2_environment_reset() { |
38 |
# Ensure we don't rely on dconf/gconf while building, bug #511946 |
39 |
export GSETTINGS_BACKEND="memory" |
40 |
|
41 |
- if has ${EAPI:-0} 6 7; then |
42 |
+ if has ${EAPI} 6 7; then |
43 |
# Try to cover the packages honoring this variable, bug #508124 |
44 |
export GST_INSPECT="$(type -P true)" |
45 |
|
46 |
@@ -110,7 +110,6 @@ gnome2_environment_reset() { |
47 |
# in the GNOME2_ECLASS_SCHEMAS environment variable. |
48 |
# This function should be called from pkg_preinst. |
49 |
gnome2_gconf_savelist() { |
50 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
51 |
pushd "${ED}" > /dev/null || die |
52 |
export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null) |
53 |
popd > /dev/null || die |
54 |
@@ -122,7 +121,6 @@ gnome2_gconf_savelist() { |
55 |
# using gconftool-2. |
56 |
# This function should be called from pkg_postinst. |
57 |
gnome2_gconf_install() { |
58 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
59 |
local updater="${EROOT%/}${GCONFTOOL_BIN}" |
60 |
|
61 |
if [[ ! -x "${updater}" ]]; then |
62 |
@@ -163,7 +161,6 @@ gnome2_gconf_install() { |
63 |
# Removes schema files previously installed by the current ebuild from Gconf's |
64 |
# database. |
65 |
gnome2_gconf_uninstall() { |
66 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
67 |
local updater="${EROOT%/}${GCONFTOOL_BIN}" |
68 |
|
69 |
if [[ ! -x "${updater}" ]]; then |
70 |
@@ -255,7 +252,6 @@ gnome2_omf_fix() { |
71 |
# in the GNOME2_ECLASS_SCROLLS environment variable. |
72 |
# This function should be called from pkg_preinst. |
73 |
gnome2_scrollkeeper_savelist() { |
74 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
75 |
pushd "${ED}" > /dev/null || die |
76 |
export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null) |
77 |
popd > /dev/null || die |
78 |
@@ -266,7 +262,6 @@ gnome2_scrollkeeper_savelist() { |
79 |
# Updates the global scrollkeeper database. |
80 |
# This function should be called from pkg_postinst and pkg_postrm. |
81 |
gnome2_scrollkeeper_update() { |
82 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
83 |
local updater="${EROOT%/}${SCROLLKEEPER_UPDATE_BIN}" |
84 |
|
85 |
if [[ ! -x "${updater}" ]] ; then |
86 |
@@ -291,7 +286,6 @@ gnome2_scrollkeeper_update() { |
87 |
# implementations that call gnome2_schemas_update conditionally. |
88 |
# This function should be called from pkg_preinst. |
89 |
gnome2_schemas_savelist() { |
90 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
91 |
pushd "${ED}" > /dev/null || die |
92 |
export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null) |
93 |
popd > /dev/null || die |
94 |
@@ -302,7 +296,6 @@ gnome2_schemas_savelist() { |
95 |
# Updates GSettings schemas. |
96 |
# This function should be called from pkg_postinst and pkg_postrm. |
97 |
gnome2_schemas_update() { |
98 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
99 |
local updater="${EROOT%/}${GLIB_COMPILE_SCHEMAS}" |
100 |
|
101 |
if [[ ! -x ${updater} ]]; then |
102 |
@@ -321,7 +314,6 @@ gnome2_schemas_update() { |
103 |
# GNOME2_ECLASS_GDK_PIXBUF_LOADERS variable. |
104 |
# This function should be called from pkg_preinst. |
105 |
gnome2_gdk_pixbuf_savelist() { |
106 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
107 |
pushd "${ED}" > /dev/null || die |
108 |
export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null) |
109 |
popd > /dev/null || die |
110 |
@@ -332,7 +324,6 @@ gnome2_gdk_pixbuf_savelist() { |
111 |
# Updates gdk-pixbuf loader cache if GNOME2_ECLASS_GDK_PIXBUF_LOADERS has some. |
112 |
# This function should be called from pkg_postinst and pkg_postrm. |
113 |
gnome2_gdk_pixbuf_update() { |
114 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
115 |
local updater="${EROOT%/}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders" |
116 |
|
117 |
if [[ ! -x ${updater} ]]; then |
118 |
@@ -389,7 +380,6 @@ gnome2_query_immodules_gtk3() { |
119 |
# Updates glib's gio modules cache. |
120 |
# This function should be called from pkg_postinst and pkg_postrm. |
121 |
gnome2_giomodule_cache_update() { |
122 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" |
123 |
local updater="${EROOT%/}/usr/bin/${CHOST}-gio-querymodules" |
124 |
|
125 |
if [[ ! -x ${updater} ]]; then |
126 |
@@ -446,8 +436,8 @@ gnome2_disable_deprecation_warning() { |
127 |
done |
128 |
} |
129 |
|
130 |
-case ${EAPI:-0} in |
131 |
-0|1|2|3|4|5|6) |
132 |
+case ${EAPI} in |
133 |
+5|6) |
134 |
|
135 |
# @FUNCTION: gnome2_icon_savelist |
136 |
# @DESCRIPTION: |
137 |
@@ -457,7 +447,6 @@ case ${EAPI:-0} in |
138 |
# gnome2_icon_cache_update conditionally. |
139 |
# This function should be called from pkg_preinst. |
140 |
gnome2_icon_savelist() { |
141 |
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" |
142 |
pushd "${ED}" > /dev/null || die |
143 |
export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null) |
144 |
popd > /dev/null || die |
145 |
-- |
146 |
2.26.2 |