Respect EROOT when running gtk-query-immodules-* tools, alike other updaters in the eclass. This ensures that x11-libs/gtk+ installs correctly when installing to a ROOT. --- eclass/gnome2-utils.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index f2aa2391a532..c0cb209cddd9 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -445,8 +445,8 @@ gnome2_gdk_pixbuf_update() { # @DESCRIPTION: # Updates gtk2 immodules/gdk-pixbuf loaders listing. gnome2_query_immodules_gtk2() { - local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0 - [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0 + local updater=${EROOT}/usr/bin/${CHOST}-gtk-query-immodules-2.0 + [[ ! -x ${updater} ]] && updater=${EROOT}/usr/bin/gtk-query-immodules-2.0 ebegin "Updating gtk2 input method module cache" GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \ @@ -459,8 +459,8 @@ gnome2_query_immodules_gtk2() { # @DESCRIPTION: # Updates gtk3 immodules/gdk-pixbuf loaders listing. gnome2_query_immodules_gtk3() { - local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0 - [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0 + local updater=${EROOT}/usr/bin/${CHOST}-gtk-query-immodules-3.0 + [[ ! -x ${updater} ]] && updater=${EROOT}/usr/bin/gtk-query-immodules-3.0 ebegin "Updating gtk3 input method module cache" GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \ -- 2.12.2