diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/gnome2-utils.eclass | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 906ae4b02e3d..2f1b67ba934a 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1149 2014/02/27 00:20:57 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1150 2014/03/01 10:18:35 mgorny Exp $ + + 01 Mar 2014; Michał Górny <mgorny@gentoo.org> gnome2-utils.eclass: + Add multilib love for gnome2_gdk_pixbuf_update(). 27 Feb 2014; Christoph Junghans <ottxor@gentoo.org> unpacker.eclass: added lzip support (bug #501912) diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index dc55cfb2fe00..c58ccc175078 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.35 2014/02/22 08:05:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.36 2014/03/01 10:18:35 mgorny Exp $ # @ECLASS: gnome2-utils.eclass # @MAINTAINER: @@ -52,12 +52,6 @@ esac # Path to glib-compile-schemas : ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"} -# @ECLASS-VARIABLE: GDK_PIXBUF_UPDATE_BIN -# @INTERNAL -# @DESCRIPTION: -# Path to gdk-pixbuf-query-loaders -: ${GDK_PIXBUF_UPDATE_BIN:="/usr/bin/gdk-pixbuf-query-loaders"} - # @ECLASS-VARIABLE: GNOME2_ECLASS_SCHEMAS # @INTERNAL # @DEFAULT_UNSET @@ -409,7 +403,7 @@ gnome2_schemas_update() { gnome2_gdk_pixbuf_savelist() { has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" pushd "${ED}" 1>/dev/null - export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find "usr/$(get_libdir)/gdk-pixbuf-2.0" -type f 2>/dev/null) + export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null) popd 1>/dev/null } @@ -420,7 +414,11 @@ gnome2_gdk_pixbuf_savelist() { # This function should be called from pkg_postinst and pkg_postrm. gnome2_gdk_pixbuf_update() { has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT="${ROOT}" - local updater="${EROOT}${GDK_PIXBUF_UPDATE_BIN}" + local updater="${EROOT}/usr/bin/${CHOST}-gdk-pixbuf-query-loaders" + + if [[ ! -x ${updater} ]]; then + updater="${EROOT}/usr/bin/gdk-pixbuf-query-loaders" + fi if [[ ! -x ${updater} ]]; then debug-print "${updater} is not executable" |