| 1 |
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 2 |
|
| 3 |
Bug: https://bugs.gentoo.org/694012 |
| 4 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org> |
| 5 |
--- |
| 6 |
eclass/gnome2-utils.eclass | 18 +++++++++--------- |
| 7 |
1 file changed, 9 insertions(+), 9 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass |
| 10 |
index e808549272d..231d4ac7477 100644 |
| 11 |
--- a/eclass/gnome2-utils.eclass |
| 12 |
+++ b/eclass/gnome2-utils.eclass |
| 13 |
@@ -136,15 +136,15 @@ gnome2_gconf_install() { |
| 14 |
|
| 15 |
# We are ready to install the GCONF Scheme now |
| 16 |
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL |
| 17 |
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")" |
| 18 |
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT%/}/;")" |
| 19 |
|
| 20 |
einfo "Installing GNOME 2 GConf schemas" |
| 21 |
|
| 22 |
local F |
| 23 |
for F in ${GNOME2_ECLASS_SCHEMAS}; do |
| 24 |
- if [[ -e "${EROOT}${F}" ]]; then |
| 25 |
+ if [[ -e "${EROOT%/}/${F}" ]]; then |
| 26 |
debug-print "Installing schema: ${F}" |
| 27 |
- "${updater}" --makefile-install-rule "${EROOT}${F}" 1>/dev/null |
| 28 |
+ "${updater}" --makefile-install-rule "${EROOT%/}/${F}" 1>/dev/null |
| 29 |
fi |
| 30 |
done |
| 31 |
|
| 32 |
@@ -176,15 +176,15 @@ gnome2_gconf_uninstall() { |
| 33 |
fi |
| 34 |
|
| 35 |
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL |
| 36 |
- export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT};")" |
| 37 |
+ export GCONF_CONFIG_SOURCE="$("${updater}" --get-default-source | sed "s;:/;:${ROOT%/}/;")" |
| 38 |
|
| 39 |
einfo "Uninstalling GNOME 2 GConf schemas" |
| 40 |
|
| 41 |
local F |
| 42 |
for F in ${GNOME2_ECLASS_SCHEMAS}; do |
| 43 |
- if [[ -e "${EROOT}${F}" ]]; then |
| 44 |
+ if [[ -e "${EROOT%/}/${F}" ]]; then |
| 45 |
debug-print "Uninstalling gconf schema: ${F}" |
| 46 |
- "${updater}" --makefile-uninstall-rule "${EROOT}${F}" 1>/dev/null |
| 47 |
+ "${updater}" --makefile-uninstall-rule "${EROOT%/}/${F}" 1>/dev/null |
| 48 |
fi |
| 49 |
done |
| 50 |
|
| 51 |
@@ -354,7 +354,7 @@ gnome2_gdk_pixbuf_update() { |
| 52 |
local tmp_file=$(emktemp) |
| 53 |
${updater} 1> "${tmp_file}" && |
| 54 |
chmod 0644 "${tmp_file}" && |
| 55 |
- cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" && |
| 56 |
+ cp -f "${tmp_file}" "${EROOT%/}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" && |
| 57 |
rm "${tmp_file}" # don't replace this with mv, required for SELinux support |
| 58 |
eend $? |
| 59 |
} |
| 60 |
@@ -368,7 +368,7 @@ gnome2_query_immodules_gtk2() { |
| 61 |
[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0 |
| 62 |
|
| 63 |
ebegin "Updating gtk2 input method module cache" |
| 64 |
- GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \ |
| 65 |
+ GTK_IM_MODULE_FILE="${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \ |
| 66 |
"${updater}" --update-cache |
| 67 |
eend $? |
| 68 |
} |
| 69 |
@@ -382,7 +382,7 @@ gnome2_query_immodules_gtk3() { |
| 70 |
[[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0 |
| 71 |
|
| 72 |
ebegin "Updating gtk3 input method module cache" |
| 73 |
- GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \ |
| 74 |
+ GTK_IM_MODULE_FILE="${EROOT%/}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \ |
| 75 |
"${updater}" --update-cache |
| 76 |
eend $? |
| 77 |
} |
| 78 |
-- |
| 79 |
2.24.1 |
Archives