fix gtk/pango/gdk-pixbuf query tools usage, be atomic, be POSIX

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

4 files changed, 85 insertions, 52 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index b09a16809838..66ca1a8c4a81 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.100 2012/04/25 09:38:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.101 2012/04/25 10:02:24 lxnay Exp $
+
+  25 Apr 2012; Fabio Erculiani <lxnay@gentoo.org>
+  emul-linux-x86-gtklibs-20110928.ebuild,
+  emul-linux-x86-gtklibs-20120127.ebuild:
+  fix gtk/pango/gdk-pixbuf query tools usage, be atomic, be POSIX
 
   25 Apr 2012; Fabio Erculiani <lxnay@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 17e7a5d506eb..e0d357ac2199 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,6 +1,6 @@
 DIST emul-linux-x86-gtklibs-20110928.tar.xz 4783132 RMD160 7baa8042badb97ef0d0fb9f1f12256491e6ae359 SHA1 af03a1a5be483607e0b2c51f3309ef74235fcc52 SHA256 13e0cf9e36f7079f73af513052667eaf7fc2b80b428a2b670fb2c0b64c47a60b
 DIST emul-linux-x86-gtklibs-20120127.tar.xz 6119504 RMD160 0c5d7351814051b908426a7dbad28eab91156a80 SHA1 bfcaf11d92eec9afcffd7f7ee945e743429fb134 SHA256 737999cff634581aae4a311520a410b268116ac18156245354d17d46b964600b
-EBUILD emul-linux-x86-gtklibs-20110928.ebuild 2602 RMD160 3d73b84267c1533570a0bfe92ecdf28c8322f60e SHA1 942657d1737625b5f7e1175e5cddf25c9e167e6e SHA256 1b68ea251c5e2a17026d4631a4a6835f7e6ecea0d885df28e89e4c948bca02b4
-EBUILD emul-linux-x86-gtklibs-20120127.ebuild 2602 RMD160 1d485c6e666b48124a572d91a5c702d6ee4b6a93 SHA1 b4aad8bd42912649bf100448b6938b16d449812a SHA256 9c8901686e1607f8a9947c9aac3eb34242d1f9f8e15e25fec1db4c63bb6c3663
-MISC ChangeLog 17698 RMD160 461a5ddc554906ad8cbd14598a2c8435cb624424 SHA1 bf8d08f7d1d50fe070412b013babb2c4535507b0 SHA256 48e20b3150b75b1f9885612d0ec21d33928285f4decf19a1a3e7bc116977e51c
+EBUILD emul-linux-x86-gtklibs-20110928.ebuild 2912 RMD160 b69c5df9829e780247cc7c26c37ec428555651ad SHA1 9959f6e3cce7289456ea9d2d68b150a4fb001ad3 SHA256 d62b14c28475c4942de1e7f24ed128a5807f2dd75d2f2f966d5e479701330923
+EBUILD emul-linux-x86-gtklibs-20120127.ebuild 2916 RMD160 720637080c28a7cc3232f116d40a7223e652cd1d SHA1 06030ba7c74831d593632f2c8d8737ecf4efcbbf SHA256 9b75e5b7824729007a762bf6c5ba075f254109af83de5c945dfa94101a62ad12
+MISC ChangeLog 17899 RMD160 3c922c5edcc717aa37a7850598b9bd1fd6b419eb SHA1 4894e10f721237f534305a125e23467fefe2bc31 SHA256 ea094d89b72df3834151d0db2e76624b08573065b222761b58c8a39ecb7de95b
 MISC metadata.xml 225 RMD160 a4128fba81c97533725f589d51de117055011d3b SHA1 873f20f8dbcaf11a00b55546daaebd1ec63a657c SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453
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 dc8f7145a845..f41678a1c5fd 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-2012 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.9 2012/04/25 09:38:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110928.ebuild,v 1.10 2012/04/25 10:02:24 lxnay Exp $
 
 EAPI="4"
 
@@ -19,8 +19,8 @@ my_gdk_pixbuf_query_loaders() {
 	# causes segfault if set
 	unset __GL_NO_DSO_FINALIZER
 
-	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
-	# be atomic!
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_query_loaders)
+
 	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
 		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 	else
@@ -29,6 +29,38 @@ my_gdk_pixbuf_query_loaders() {
 	rm "${tmp_file}"
 }
 
+my_pango_querymodules() {
+	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+	einfo "Generating pango modules listing..."
+
+	mkdir -p "${PANGO_CONFDIR}"
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
+
+	if pango-querymodules32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${pango_conf}"
+	else
+		ewarn "Cannot update pango.modules, file generation failed"
+	fi
+	rm "${tmp_file}"
+}
+
+my_gtk_query_immodules() {
+	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+
+	mkdir -p "${GTK2_CONFDIR}"
+	local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+
+	if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${gtk_conf}"
+	else
+		ewarn "Cannot update gtk.immodules, file generation 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})"
@@ -48,30 +80,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	einfo "Generating pango modules listing..."
-
-	mkdir -p "${PANGO_CONFDIR}"
-	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
-
-	# be atomic!
-	pango-querymodules32 > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${pango_conf}" || die
-	else
-		ewarn "Cannot update pango.modules, file generation failed"
-	fi
-	rm "${tmp_file}"
-
-	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"
+	my_pango_querymodules
+	my_gtk_query_immodules
 	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
+	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
 		ewarn
 		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
 		ewarn "multilib systems, please remove it by hand."
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild
index e54cf937565e..41868d08db30 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.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/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild,v 1.7 2012/04/25 09:38:01 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild,v 1.8 2012/04/25 10:02:24 lxnay Exp $
 
 EAPI="4"
 
@@ -19,8 +19,8 @@ my_gdk_pixbuf_query_loaders() {
 	# causes segfault if set
 	unset __GL_NO_DSO_FINALIZER
 
-	tmp_file=$(mktemp --suffix=gdk_pixbuf_ebuild)
-	# be atomic!
+	local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
+
 	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
 		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 	else
@@ -29,6 +29,38 @@ my_gdk_pixbuf_query_loaders() {
 	rm "${tmp_file}"
 }
 
+my_pango_querymodules() {
+	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+	einfo "Generating pango modules listing..."
+
+	mkdir -p "${PANGO_CONFDIR}"
+	local pango_conf="${PANGO_CONFDIR}/pango.modules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
+
+	if pango-querymodules32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${pango_conf}"
+	else
+		ewarn "Cannot update pango.modules, file generation failed"
+	fi
+	rm "${tmp_file}"
+}
+
+my_gtk_query_immodules() {
+	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+
+	mkdir -p "${GTK2_CONFDIR}"
+	local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
+
+	if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
+		cat "${tmp_file}" > "${gtk_conf}"
+	else
+		ewarn "Cannot update gtk.immodules, file generation 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})"
@@ -48,30 +80,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	einfo "Generating pango modules listing..."
-
-	mkdir -p "${PANGO_CONFDIR}"
-	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild)
-
-	# be atomic!
-	pango-querymodules32 > "${tmp_file}"
-	if [ "${?}" = "0" ]; then
-		cat "${tmp_file}" > "${pango_conf}" || die
-	else
-		ewarn "Cannot update pango.modules, file generation failed"
-	fi
-	rm "${tmp_file}"
-
-	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"
+	my_pango_querymodules
+	my_gtk_query_immodules
 	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
+	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
 		ewarn
 		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
 		ewarn "multilib systems, please remove it by hand."