Run gdk-pixbuf-query-loaders32 as suggested by lxnay to catch failures properly, also run pango-querymodules32 as vapier suggested in bug #384671.

Package-Manager: portage-2.1.10.40/cvs/Linux x86_64

3 files changed, 31 insertions, 18 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 5e5ace9d8c0d..ba757b1e5684 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.92 2011/10/16 12:09:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.93 2011/12/11 13:31:43 pacho Exp $
+
+  11 Dec 2011; Pacho Ramos <pacho@gentoo.org>
+  emul-linux-x86-gtklibs-20110928.ebuild:
+  Run gdk-pixbuf-query-loaders32 as suggested by lxnay to catch failures
+  properly, also run pango-querymodules32 as vapier suggested in bug #384671.
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-gtklibs-20110928.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index c724b6de4004..0602bdaf4f87 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -6,17 +6,13 @@ DIST emul-linux-x86-gtklibs-20110722.tar.xz 4826976 RMD160 c20d694a08aa8342aacf0
 DIST emul-linux-x86-gtklibs-20110928.tar.xz 4783132 RMD160 7baa8042badb97ef0d0fb9f1f12256491e6ae359 SHA1 af03a1a5be483607e0b2c51f3309ef74235fcc52 SHA256 13e0cf9e36f7079f73af513052667eaf7fc2b80b428a2b670fb2c0b64c47a60b
 EBUILD emul-linux-x86-gtklibs-20110129.ebuild 2046 RMD160 fc64d631dedcdf6a405ae098822f3b636330aae5 SHA1 fa98d1b912b19587e6dccb54e288d860a906bb69 SHA256 f47801ad64574f78e1b6f8720183ecf807d3705aad33b61405b7325597e7c41d
 EBUILD emul-linux-x86-gtklibs-20110722.ebuild 2061 RMD160 8047e79ccb8c9f5988fb590a328a2de241097038 SHA1 ecaad0ccb6af5888cb687a709ad09766599b14cc SHA256 bc0feb8cfab270fc0c7827e3be4a64ce7f91e7b907d4c2ade45b32df2ea7da75
-EBUILD emul-linux-x86-gtklibs-20110928.ebuild 2062 RMD160 c361b86df86f11ec2c8d50d44d1612d802f12e2e SHA1 2dfff6b97bd9476dc471cab5ae22c50355b36b2f SHA256 8c782b510039d98ec19c8b9c0f3302e4d83384d158eaf968fd00eca535a9fe70
-MISC ChangeLog 16123 RMD160 7c52eeaf48dcb158c08b59fd2599d3d5222388f8 SHA1 50e3387a62b271d21c03ce6bcae1d9b85110b670 SHA256 687b35d1a5979e8844dd1a408ec3448a619cea65181a730b4cff7f70f0518f93
+EBUILD emul-linux-x86-gtklibs-20110928.ebuild 2334 RMD160 34961f8961273f07b78b0a18163ff91c6fbb5e2b SHA1 7bfa9b1ebfa473d6e9feede050eec4ebeede2904 SHA256 4a029fe639e13da59eef1aa896309c55c0be4d5009313e05f472eed0fc62bf19
+MISC ChangeLog 16359 RMD160 935ed3e0fcce5693406c75577258ceef3356e4f4 SHA1 ed227ed10bd0ae5dd84de5639999616091751e54 SHA256 d84eb398b84907290f6688971250a202c7f9980e1e18f87c828bfc17e2ece2ed
 MISC metadata.xml 225 RMD160 a4128fba81c97533725f589d51de117055011d3b SHA1 873f20f8dbcaf11a00b55546daaebd1ec63a657c SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmsl9AAoJEEdUh39IaPFNR1gH/3BPU9bZbbm2h07ZNDwrQEwP
-onYCVoDYnCqdxK3UZPkrDG4x3S9ENO+napMvmPYI0MdUKh+XorsIqjNWKS2RvUiY
-c07YWNEBkhMhTTpiUBBS8N55BWQSOlviW8jr8M9y3v7rfgmJjVKo47RBGn+OJtVW
-ROpREesaWKZhAQA71DS/Hp12D/MGjoKARRq9uf3802LbNowq47lTxn7ViUbItMSb
-NRwriaMfeAxUQbjtNMilswhjxNjs8xyxCIM/gaRqhSMtcv/rSiHSfaxOz4D9uNvK
-ExfdZqOwMb82V6djdvLE8bH3MOmJYJMvUl2tEonY7O/3l+Tr+TSS1UgyQkOruSw=
-=lVSt
+iEYEARECAAYFAk7ksMUACgkQCaWpQKGI+9RNaACfVoszsAmo0Z7uhckI80TkCYyA
+cTIAn0RNh6Q4JImeruee5mmGZnYqw9hw
+=ms6r
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild
index 21ae629e3366..8cdeb292bc7d 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild,v 1.4 2011/10/16 12:09:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild,v 1.5 2011/12/11 13:31:43 pacho Exp $
 
 EAPI="4"
 
@@ -15,6 +15,20 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
 	~app-emulation/emul-linux-x86-opengl-${PV}"
 # RDEPEND on opengl stuff shouldn't be needed, but add it anyway until bug #354943 is properly solved
 
+my_gdk_pixbuf_query_loaders() {
+	# causes segfault if set
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	else
+		ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
+	fi
+	rm "${tmp_file}"
+}
+
 src_prepare() {
 	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
 	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
@@ -35,17 +49,15 @@ pkg_preinst() {
 
 pkg_postinst() {
 	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	if [[ ${ROOT} == "/" ]] ; then
-		einfo "Generating pango modules listing..."
-		mkdir -p ${PANGO_CONFDIR}
-		pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-	fi
+	einfo "Generating pango modules listing..."
+	mkdir -p ${PANGO_CONFDIR}
+	pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules || die
 
 	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
 	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
 	mkdir -p ${GTK2_CONFDIR}
 	gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	gdk-pixbuf-query-loaders32 > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	my_gdk_pixbuf_query_loaders
 
 	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
 	if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then