Version bump, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64, RepoMan options: --force)

3 files changed, 32 insertions, 69 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index ba757b1e5684..9f508bda0145 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.93 2011/12/11 13:31:43 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.94 2012/01/27 18:04:28 pacho Exp $
+
+*emul-linux-x86-gtklibs-20120127 (27 Jan 2012)
+
+  27 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-gtklibs-20120127.ebuild,
+  -emul-linux-x86-gtklibs-20110129.ebuild,
+  -emul-linux-x86-gtklibs-20110722.ebuild:
+  Version bump, remove old.
 
   11 Dec 2011; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-gtklibs-20110928.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild
deleted file mode 100644
index 1b40056b907d..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110129.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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-20110129.ebuild,v 1.3 2011/03/30 09:05:21 pacho Exp $
-
-inherit emul-linux-x86
-
-LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${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
-
-src_unpack() {
-	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})"
-	emul-linux-x86_src_unpack
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
-}
-
-pkg_preinst() {
-	#bug 169058
-	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
-		[[ -L ${l} ]] && rm -f ${l}
-	done
-}
-
-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
-
-	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"
-
-	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
-	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."
-		ewarn
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild
index 01935337ed9a..89f452f842e7 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20110722.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild
@@ -1,19 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-20110722.ebuild,v 1.2 2011/08/24 10:01:24 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20120127.ebuild,v 1.1 2012/01/27 18:04:28 pacho Exp $
 
 EAPI="4"
 
 inherit emul-linux-x86
 
 LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 
 DEPEND=""
 RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${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
+	~app-emulation/emul-linux-x86-xlibs-${PV}"
+
+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"
@@ -35,17 +47,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