simplify pango-querymodules usage

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

6 files changed, 30 insertions, 42 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 5d017ec1ae6b..54f75839689a 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.342 2012/04/25 06:30:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.343 2012/04/25 09:42:36 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:
+  simplify pango-querymodules usage
 
   25 Apr 2012; Fabio Erculiani <lxnay@gentoo.org> pango-1.28.3-r1.ebuild,
   pango-1.28.4.ebuild:
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index e06229a8a612..90a34fca7f7a 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 3020 RMD160 1e4af158d98c81b3bd47356b6652b198fca1d772 SHA1 aa10fa59c8ff0dadcd82cecf64605df86e8f45d5 SHA256 f2c6f21288541924fc3fcc1787db55146c1b4255dc353ffb7d303226784a0fe4
-EBUILD pango-1.28.4.ebuild 2707 RMD160 852c9bfaf0e997cbbb35a597771c2aebef8ff93a SHA1 104096a495cd2bd5a70a563c8cc369e03fdaaed3 SHA256 c814eb528c5d083cb5613c50c368cdca1cddde4957e56547399117b6be59c951
-EBUILD pango-1.29.4.ebuild 2753 RMD160 7b3344945d458335667eb26e7edf43a46e29cb8b SHA1 892a4824d189cfe9837cace61260660dc4bde9a5 SHA256 f8ceaa28050034cebfa615747fdd66c94a2ea2ce649c3138eea38f5b492b97ee
-EBUILD pango-1.30.0.ebuild 2723 RMD160 e99d4870fcac8ffe17a2ef7352fc812eb497bf0a SHA1 bf74555236910a362d8c2cbc517f252eed7adf69 SHA256 592f0b45e26d5b8a359e9149aa65ccd07025370b79294d1eec0948ab778a0458
-MISC ChangeLog 43005 RMD160 590a440c9ad41a5a663040c013f60b1edb9a03ce SHA1 17293e4c4b545e4ec55fa45f5733ce36b4b64a0e SHA256 88424c6942d89e4133e7bf66dcdbcfc11bc74351218bf30254672aa1d7c00d9e
+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
 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 b9275c7978cd..83f6c97b87f1 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.12 2012/04/25 06:30:19 lxnay Exp $
+# $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 $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -87,18 +87,14 @@ pkg_postinst() {
 		fi
 
 		mkdir -p "${PANGO_CONFDIR}"
-		pango_conf="${PANGO_CONFDIR}/pango.modules"
-		tmp_pango_conf="${PANGO_CONFDIR}/._tmp_ebuild_pango.modules"
+		local pango_conf="${PANGO_CONFDIR}/pango.modules"
+		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
-		tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 		# be atomic!
 		pango-querymodules > "${tmp_file}"
 		if [ "${?}" = "0" ]; then
-			cp -p "${pango_conf}" "${tmp_pango_conf}" && \
-				cat "${tmp_file}" > "${tmp_pango_conf}" && \
-				mv "${tmp_pango_conf}" "${pango_conf}"
-		fi
-		if [ "${?}" != "0" ]; then
+			cat "${tmp_file}" > "${pango_conf}" || die
+		else
 			ewarn "Cannot update pango.modules, file generation failed"
 		fi
 		rm "${tmp_file}"
diff --git a/x11-libs/pango/pango-1.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild
index 92b885db5c79..2b8becb33f22 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.18 2012/04/25 06:30:19 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.19 2012/04/25 09:42:36 lxnay Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -78,18 +78,14 @@ pkg_postinst() {
 		fi
 
 		mkdir -p "${PANGO_CONFDIR}"
-		pango_conf="${PANGO_CONFDIR}/pango.modules"
-		tmp_pango_conf="${PANGO_CONFDIR}/._tmp_ebuild_pango.modules"
+		local pango_conf="${PANGO_CONFDIR}/pango.modules"
+		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
-		tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 		# be atomic!
 		pango-querymodules > "${tmp_file}"
 		if [ "${?}" = "0" ]; then
-			cp -p "${pango_conf}" "${tmp_pango_conf}" && \
-				cat "${tmp_file}" > "${tmp_pango_conf}" && \
-				mv "${tmp_pango_conf}" "${pango_conf}"
-		fi
-		if [ "${?}" != "0" ]; then
+			cat "${tmp_file}" > "${pango_conf}" || die
+		else
 			ewarn "Cannot update pango.modules, file generation failed"
 		fi
 		rm "${tmp_file}"
diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild
index 6572b7a9a4bd..91fde6dbd1d3 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.12 2012/04/25 06:24:59 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.13 2012/04/25 09:42:36 lxnay Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -77,20 +77,16 @@ pkg_postinst() {
 	multilib_enabled && PANGO_CONFDIR+="/${CHOST}"
 
 	mkdir -p "${PANGO_CONFDIR}"
-	pango_conf="${PANGO_CONFDIR}/pango.modules"
-	tmp_pango_conf="${PANGO_CONFDIR}/._tmp_ebuild_pango.modules"
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
-	tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 	# be atomic!
 	pango-querymodules \
 		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
 		> "${tmp_file}"
 	if [ "${?}" = "0" ]; then
-		cp -p "${pango_conf}" "${tmp_pango_conf}" && \
-			cat "${tmp_file}" > "${tmp_pango_conf}" && \
-			mv "${tmp_pango_conf}" "${pango_conf}"
-	fi
-	if [ "${?}" != "0" ]; then
+		cat "${tmp_file}" > "${pango_conf}" || die
+	else
 		ewarn "Cannot update pango.modules, file generation failed"
 	fi
 	rm "${tmp_file}"
diff --git a/x11-libs/pango/pango-1.30.0.ebuild b/x11-libs/pango/pango-1.30.0.ebuild
index f776e804b41d..6a5616ae36a6 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.3 2012/04/25 06:24:59 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.0.ebuild,v 1.4 2012/04/25 09:42:36 lxnay Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -76,20 +76,16 @@ pkg_postinst() {
 	multilib_enabled && PANGO_CONFDIR+="/${CHOST}"
 
 	mkdir -p "${PANGO_CONFDIR}"
-	pango_conf="${PANGO_CONFDIR}/pango.modules"
-	tmp_pango_conf="${PANGO_CONFDIR}/._tmp_ebuild_pango.modules"
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 
-	tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
 	# be atomic!
 	pango-querymodules \
 		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
 		> "${tmp_file}"
 	if [ "${?}" = "0" ]; then
-		cp -p "${pango_conf}" "${tmp_pango_conf}" && \
-			cat "${tmp_file}" > "${tmp_pango_conf}" && \
-			mv "${tmp_pango_conf}" "${pango_conf}"
-	fi
-	if [ "${?}" != "0" ]; then
+		cat "${tmp_file}" > "${pango_conf}" || die
+	else
 		ewarn "Cannot update pango.modules, file generation failed"
 	fi
 	rm "${tmp_file}"