sync pango-querymodules usage with emul-linux-x86-gtklibs

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 28 insertions, 25 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 54f75839689a..6c5472d9d017 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.343 2012/04/25 09:42:36 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.344 2012/04/25 10:11:21 lxnay Exp $
+
+  25 Apr 2012; Fabio Erculiani <lxnay@gentoo.org> pango-1.28.3-r1.ebuild,
+  pango-1.28.4.ebuild, pango-1.29.4.ebuild, pango-1.30.0.ebuild:
+  sync pango-querymodules usage with emul-linux-x86-gtklibs
 
   25 Apr 2012; Fabio Erculiani <lxnay@gentoo.org> pango-1.28.3-r1.ebuild,
   pango-1.28.4.ebuild, pango-1.29.4.ebuild, pango-1.30.0.ebuild:
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 90a34fca7f7a..4102460eb768 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -5,9 +5,9 @@ DIST pango-1.28.3.tar.bz2 1509501 RMD160 cdfd6d695b169e15801956fbfd54438c109f7a6
 DIST pango-1.28.4.tar.bz2 1503441 RMD160 e9dc19b62263fdbd5b58c00092220af87ed929df SHA1 e715954a5a3b358889d15b6235e1965303dbb622 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f
 DIST pango-1.29.4.tar.xz 1155456 RMD160 90fc0b73022f980e8971922fec990653bddb4431 SHA1 e1fc4a729440b168a033addea0c2aa5ce17c6e5c SHA256 7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f
 DIST pango-1.30.0.tar.xz 1158224 RMD160 b94aedbbb314ccfbc9f075ee82c8cea39a913e62 SHA1 d49c1ef1cbbe326b5d70e32d84f7163e7064c77c SHA256 7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff
-EBUILD pango-1.28.3-r1.ebuild 2846 RMD160 a862180d254de670a00ee231eeb8d8db23ed4459 SHA1 13ed11eeaea85ca722c969c137a66a221db668ad SHA256 b611c6bc7289c66f3c8f73a358afe358db19e89140303eb40d0568b94eefb87a
-EBUILD pango-1.28.4.ebuild 2533 RMD160 e4223d1954283c720a74194f54c81e4d3de2b40e SHA1 73ca5f8a22d84e458872b0680cf159df8ce9f157 SHA256 ca336bfc44967d4cfa975a9e8a1fb9969a9e8e3abcefd0d2e96803047167a676
-EBUILD pango-1.29.4.ebuild 2583 RMD160 5bccd90f83dae71387de5ff247647bde6e86a3c1 SHA1 5cb76e74d0c12d93568c229fcf72d0d180300535 SHA256 91e9bb8323ca7ec9e58c248f7e9d6f52bdee6d62f2fa59a217d3471b15af5eeb
-EBUILD pango-1.30.0.ebuild 2553 RMD160 c0448dbe2bba28886cf53f08f3ac304f628f1e40 SHA1 8b20d3f2336351ff39297169e6a89229753fb143 SHA256 126f4606a179aa941111e95c72ba1da7265481a458fc6a16852a0b6292069cb3
-MISC ChangeLog 43181 RMD160 f06732385e84e6878327b04f56f94b7fe06c5908 SHA1 16a857ada26e495e751db7b59fc40186feb967ff SHA256 9323534c7220d0c36de948ff9c15acb8d2eda61e988ce21201ca12237881f206
+EBUILD pango-1.28.3-r1.ebuild 2839 RMD160 153ee62ebbd9dddb1d7176ce801bd215a1513320 SHA1 d413377ce46fb453f3a7ff5d6070c56a7918e91c SHA256 3f384d08260298cb0ff8ea3876e4a0fb5cfb6ce944e885475a1ae2cfa2395098
+EBUILD pango-1.28.4.ebuild 2541 RMD160 5ea340c234637e1693fbd56cea699828c51c4ae2 SHA1 2092a1960d36359efdc56cd42f7c8adb46ff2f34 SHA256 8cedbed2d8b69c8a0125f498f2490a2a9feb0a01f822e2126f1dfa500f401fb1
+EBUILD pango-1.29.4.ebuild 2592 RMD160 22c49cc3a5cb00f0e8644317ac35b5da5ceb68b3 SHA1 bc1aee7b0684f3be3cae4fb0b351e5ae75cdb0b0 SHA256 f8b5cd6e621b456f4872f2c0bb156f577becd76027199cadcd8a941a4c008147
+EBUILD pango-1.30.0.ebuild 2562 RMD160 5f24735330415ba03db719bef0bda979bcc57c39 SHA1 f6cce0537be1b4379af3283dd3c53906265e9048 SHA256 649d8e7b95fe680407e96c2bbc11161326c38c4466291fa807542198420c79c6
+MISC ChangeLog 43381 RMD160 14a3586cd8a6cab05a4e37845f161e4d8c8edd2a SHA1 9ffd4627bc046ccf5a93ebd0a0b75123051b9a4e SHA256 5d7d4bf8f6f6fe93d5ee968c4fcecb0a9f0e9362dfe267feb83640ac43bbec90
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
diff --git a/x11-libs/pango/pango-1.28.3-r1.ebuild b/x11-libs/pango/pango-1.28.3-r1.ebuild
index 83f6c97b87f1..f80312c276e9 100644
--- a/x11-libs/pango/pango-1.28.3-r1.ebuild
+++ b/x11-libs/pango/pango-1.28.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3-r1.ebuild,v 1.13 2012/04/25 09:42:36 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3-r1.ebuild,v 1.14 2012/04/25 10:11:21 lxnay Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -90,10 +90,9 @@ pkg_postinst() {
 		local pango_conf="${PANGO_CONFDIR}/pango.modules"
 		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
-		# be atomic!
-		pango-querymodules > "${tmp_file}"
-		if [ "${?}" = "0" ]; then
-			cat "${tmp_file}" > "${pango_conf}" || die
+		if pango-querymodules > "${tmp_file}"; then
+			cat "${tmp_file}" > "${pango_conf}" || {
+				rm "${tmp_file}"; die; }
 		else
 			ewarn "Cannot update pango.modules, file generation failed"
 		fi
diff --git a/x11-libs/pango/pango-1.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild
index 2b8becb33f22..e6f690458555 100644
--- a/x11-libs/pango/pango-1.28.4.ebuild
+++ b/x11-libs/pango/pango-1.28.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.19 2012/04/25 09:42:36 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.20 2012/04/25 10:11:21 lxnay Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -82,9 +82,9 @@ pkg_postinst() {
 		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
 		# be atomic!
-		pango-querymodules > "${tmp_file}"
-		if [ "${?}" = "0" ]; then
-			cat "${tmp_file}" > "${pango_conf}" || die
+		if pango-querymodules > "${tmp_file}"; then
+			cat "${tmp_file}" > "${pango_conf}" || {
+				rm "${tmp_file}"; die; }
 		else
 			ewarn "Cannot update pango.modules, file generation failed"
 		fi
diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild
index 91fde6dbd1d3..a82313cfba60 100644
--- a/x11-libs/pango/pango-1.29.4.ebuild
+++ b/x11-libs/pango/pango-1.29.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.13 2012/04/25 09:42:36 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.14 2012/04/25 10:11:21 lxnay Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -81,11 +81,11 @@ pkg_postinst() {
 	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
 	# be atomic!
-	pango-querymodules \
+	if pango-querymodules \
 		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
-		> "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${pango_conf}" || die
+			> "${tmp_file}"; then
+		cat "${tmp_file}" > "${pango_conf}" || {
+			rm "${tmp_file}"; die; }
 	else
 		ewarn "Cannot update pango.modules, file generation failed"
 	fi
diff --git a/x11-libs/pango/pango-1.30.0.ebuild b/x11-libs/pango/pango-1.30.0.ebuild
index 6a5616ae36a6..3985b9767fbf 100644
--- a/x11-libs/pango/pango-1.30.0.ebuild
+++ b/x11-libs/pango/pango-1.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.0.ebuild,v 1.4 2012/04/25 09:42:36 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.0.ebuild,v 1.5 2012/04/25 10:11:21 lxnay Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -80,11 +80,11 @@ pkg_postinst() {
 	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
 	# be atomic!
-	pango-querymodules \
+	if pango-querymodules \
 		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
-		> "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${pango_conf}" || die
+			> "${tmp_file}"; then
+		cat "${tmp_file}" > "${pango_conf}" || {
+			rm "${tmp_file}"; die; }
 	else
 		ewarn "Cannot update pango.modules, file generation failed"
 	fi