From: Michał Górny Date: Sun, 23 Nov 2014 15:00:44 +0000 (+0000) Subject: Support multilib for gnome2_query_immodules_gtk3(), needed by x11-libs/gtk+:3. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d74a35d97894fdb56ff47008371e21397379c6cb;p=gentoo.git Support multilib for gnome2_query_immodules_gtk3(), needed by x11-libs/gtk+:3. --- diff --git a/eclass/ChangeLog b/eclass/ChangeLog index defb5e35678d..edefc50f6261 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1439 2014/11/22 18:24:17 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1440 2014/11/23 15:00:44 mgorny Exp $ + + 23 Nov 2014; Michał Górny gnome2-utils.eclass: + Support multilib for gnome2_query_immodules_gtk3(), needed by + x11-libs/gtk+:3. 22 Nov 2014; Andreas K. Huettel perl-module.eclass: Make calling perl-module_pkg_prerm trigger a real warning diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index c58ccc175078..0d72fa9d05c8 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.36 2014/03/01 10:18:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.37 2014/11/23 15:00:44 mgorny Exp $ # @ECLASS: gnome2-utils.eclass # @MAINTAINER: @@ -479,7 +479,10 @@ gnome2_query_immodules_gtk2() { # @DESCRIPTION: # Updates gtk3 immodules/gdk-pixbuf loaders listing. gnome2_query_immodules_gtk3() { - "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache + local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0 + [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0 + + "${updater}" --update-cache } # @FUNCTION: gnome2_disable_deprecation_warning