[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2-utils.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      14/03/01 10:18:35

  Modified:             ChangeLog gnome2-utils.eclass
  Log:
  Add multilib love for gnome2_gdk_pixbuf_update().

Revision  Changes    Path
1.1150               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1149&r2=1.1150

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -r1.1149 -r1.1150
--- ChangeLog	27 Feb 2014 00:20:57 -0000	1.1149
+++ ChangeLog	1 Mar 2014 10:18:35 -0000	1.1150
@@ -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)



1.36                 eclass/gnome2-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2-utils.eclass?r1=1.35&r2=1.36

Index: gnome2-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome2-utils.eclass	22 Feb 2014 08:05:45 -0000	1.35
+++ gnome2-utils.eclass	1 Mar 2014 10:18:35 -0000	1.36
@@ -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 @@
 # 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_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 @@
 # 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"