fix gdk-pixbuf-query-loaders usage, be atomic

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

6 files changed, 94 insertions, 30 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 1dcc3b6d13d0..e19e9cb5bc87 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.250 2011/09/27 18:16:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.251 2011/10/09 08:54:42 lxnay Exp $
+
+  09 Oct 2011; Fabio Erculiani <lxnay@gentoo.org> librsvg-2.32.1.ebuild,
+  librsvg-2.34.0.ebuild, librsvg-2.34.1.ebuild, librsvg-2.34.1-r1.ebuild:
+  fix gdk-pixbuf-query-loaders usage, be atomic
 
   27 Sep 2011; Kacper Kowalik <xarthisius@gentoo.org> librsvg-2.34.1.ebuild:
   ppc/ppc64 stable wrt #382403
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 603ea6f3acef..38932238378f 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX librsvg-2.34.0-automagic-gtk.patch 1420 RMD160 8b1740121a13ef1edaef44f6c6293f140432ab71 SHA1 91fd1a8713fe1296b30e2e3281cd72087c96ae4b SHA256 56e63ee0f4bd9baea7244fddc18622e88902bf0ccbfa18700c111157b05e4ef7
 DIST librsvg-2.32.1.tar.bz2 517170 RMD160 ac039d36667854292f2326aaadec9de6ea2873b6 SHA1 2762cfa3a4e9c9ee845c7f23a824dbd13583ebf0 SHA256 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334
 DIST librsvg-2.34.0.tar.bz2 516994 RMD160 02638bcf084156e4e209a325a20e99d2e88e9fd8 SHA1 59e01568a6b201fc45828a76b942f790859cddeb SHA256 9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd
 DIST librsvg-2.34.1.tar.xz 482380 RMD160 612dacdae9665445b982bf70b2c589c801b83f03 SHA1 2fdc23e7e06c153adc001efa6b1cb5c0aa28a6aa SHA256 4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db
-EBUILD librsvg-2.32.1.ebuild 1697 RMD160 9f08a81f5472fcb282a073a2a083e9552c804fe8 SHA1 ef33bcc4c64715f2f8eb4bbc0b5db5bdc4e4d3b8 SHA256 4820d94c6015c5953d36369ba6a0e35c7e572729546166eb7ebe478849b57b92
-EBUILD librsvg-2.34.0.ebuild 1740 RMD160 833449e5d8f20cdd0271a1923d4ca5f5560a7816 SHA1 e26a6b3a024bdbd4fe908a5469679feee410af69 SHA256 df3a2ecd20a0f590a6840a0aad97b9c37950479d4d1afb2a8630b1339fe2b5dc
-EBUILD librsvg-2.34.1-r1.ebuild 1925 RMD160 8f90559246c09cec7234e72838953898b5dc0e55 SHA1 c8158a6f42a7ac9366687c0e460a5d438fa97b9d SHA256 9b269b6a2953e5e18ed0155d33db2c114af0374ceae2eb90272152d41cf1dada
-EBUILD librsvg-2.34.1.ebuild 1718 RMD160 23058c60633ebbaf10c8466c9f9447481ec9ba47 SHA1 bfa5e05b4cad16b228c238a665dfb82209c71162 SHA256 7f039ebe7e22f4ca8f451773f7f60267cf72c339a217c1eae51af4cc65428704
-MISC ChangeLog 31860 RMD160 912f544897b946ae4c0b614a51659567ff0ad1be SHA1 ccebe44d118fa7e713918889329a85a4a100bc15 SHA256 f50dcdb3b34786e82c5af85c9b0e1aa45077c8dc1c6d1f5cbb7ce62a64519ac0
+EBUILD librsvg-2.32.1.ebuild 2131 RMD160 e7aade0ee59dfa19018f6bdf55690063c0ce6bce SHA1 f6ae6333cc2a41ee705da8b7ba8d4bf384d1f6b4 SHA256 b89847cbec0d4e2574d6f8918d1593d9972da93613aec4e84bbb98758b1626ca
+EBUILD librsvg-2.34.0.ebuild 2177 RMD160 601069f1d464af88558c1c287fa2db1a04ea0ab0 SHA1 9837ac6cf4574fcaf0c08d2bbd94d473d4ff3af0 SHA256 7b2a29f66518c643f408572f481352fafdb1699130f6a6b55b407bb474f0156e
+EBUILD librsvg-2.34.1-r1.ebuild 2359 RMD160 c3ba88a069e86c2a0253381fc84b2a975012cf38 SHA1 c55c8297d3ee7dae2831f9b3750ffd6dd36ea579 SHA256 dc48a70f7d8d96941efc84d6c0b7a4da5e6a5d0b9013dac83a1e92524069c0ca
+EBUILD librsvg-2.34.1.ebuild 2147 RMD160 27e6f959decf35ab4f94556f7e6839226b9be045 SHA1 159d13ab5d7bfed4fdc3c90f3eee4f94df56e125 SHA256 60ffcfdc048b70dae5f27152e894fec8a87932c01c9b75d84588d08cb1d73b01
+MISC ChangeLog 32051 RMD160 66a82b3db0b5ce808cf930486e4f03024a76c527 SHA1 ea6f0bade0a81fc88dcd2e976c0b74f5a3547a33 SHA256 c311bc8f6c42cc06825fbcd65e64b177ea5216f95a0c93c472d438649d94353a
 MISC metadata.xml 276 RMD160 52ef94c7407f4f59a15e5c785947fe01d685215a SHA1 852d1ba1e66651444d421f371b17267705a9e894 SHA256 7fe041dc0de35f5a0dbc687d6fc073b651d920b2ec25b45b4a91a8cb0d9e763d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQECAAYFAk6CEwoACgkQIiMqcbOVdxSkggP/WwpdpggbZpQBvbEvGl0lbmKN
-1UStp9TNtiVOm3+mpTBlXrbyQ4BLdmt9OfgsTSidglwqkj6cDSMyc/APuUWRnZUZ
-Ub2T1MpwO/yBNTUeSGB1DIp1GXPVarShWjabUF+maAlPBwfIS+YmIqfd81svxI1P
-pe1n+S9aSvE9ZVvbHs4=
-=9/Js
------END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/librsvg-2.32.1.ebuild b/gnome-base/librsvg/librsvg-2.32.1.ebuild
index e8df3b3ed676..aa3ed27665a6 100644
--- a/gnome-base/librsvg/librsvg-2.32.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.32.1.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/gnome-base/librsvg/librsvg-2.32.1.ebuild,v 1.9 2011/03/22 19:19:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.32.1.ebuild,v 1.10 2011/10/09 08:54:42 lxnay Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -50,9 +50,27 @@ src_install() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
 
 pkg_postrm() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
diff --git a/gnome-base/librsvg/librsvg-2.34.0.ebuild b/gnome-base/librsvg/librsvg-2.34.0.ebuild
index 393a7c66392d..7bfeca0eb1af 100644
--- a/gnome-base/librsvg/librsvg-2.34.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.34.0.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/gnome-base/librsvg/librsvg-2.34.0.ebuild,v 1.9 2011/08/20 18:38:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.0.ebuild,v 1.10 2011/10/09 08:54:42 lxnay Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -54,9 +54,27 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
 
 pkg_postrm() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
diff --git a/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild
index d6021d327e6b..82ca5bb4172f 100644
--- a/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.34.1-r1.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/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild,v 1.1 2011/09/09 20:02:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.1-r1.ebuild,v 1.2 2011/10/09 08:54:42 lxnay Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -57,9 +57,27 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
 
 pkg_postrm() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
diff --git a/gnome-base/librsvg/librsvg-2.34.1.ebuild b/gnome-base/librsvg/librsvg-2.34.1.ebuild
index d34dce08c174..6c1bc1bf573d 100644
--- a/gnome-base/librsvg/librsvg-2.34.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.34.1.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/gnome-base/librsvg/librsvg-2.34.1.ebuild,v 1.5 2011/09/27 18:16:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.1.ebuild,v 1.6 2011/10/09 08:54:42 lxnay Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -53,9 +53,27 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }
 
 pkg_postrm() {
-	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
+	# be atomic!
+	gdk-pixbuf-query-loaders > "${tmp_file}"
+	if [ "${?}" = "0" ]; then
+		cat "${tmp_file}" > "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+	fi
+	rm "${tmp_file}"
 }