Bump wrt bug 201860

Package-Manager: portage-2.1.4_rc9

4 files changed, 76 insertions, 17 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 83b2ee32b395..57fa4f7a0794 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.53 2007/11/24 01:20:18 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.54 2007/12/11 00:05:38 welp Exp $
+
+*emul-linux-x86-gtklibs-20071210 (11 Dec 2007)
+
+  11 Dec 2007; <welp@gentoo.org> +emul-linux-x86-gtklibs-20071210.ebuild:
+  Bump wrt bug 201860
 
   24 Nov 2007; Mike Doty <kingtaco@gentoo.org>
   emul-linux-x86-gtklibs-20071121.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index cd1114ee003a..50749fac527b 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50emul-linux-x86-gtklibs 14 RMD160 bfec6865ba08ad120cfb30218b31b50120a55931 SHA1 8bd950e5e5a40f491b2a389f3236ac2557490aa8 SHA256 82ec78c260f9f7c1a0bd0ad98dd2cf70bc1d09cc57bfb43e7d690999f7a4e7aa
 MD5 c5be4cc3b169ef841633df1d37e28a64 files/50emul-linux-x86-gtklibs 14
 RMD160 bfec6865ba08ad120cfb30218b31b50120a55931 files/50emul-linux-x86-gtklibs 14
@@ -16,6 +13,7 @@ DIST emul-linux-x86-gtklibs-2.8.8.tar.bz2 2892105 RMD160 7bddf9725383e69519e4c70
 DIST emul-linux-x86-gtklibs-20071114.tar.bz2 4712580 RMD160 e3e4e1b1ce19ba9498c105b12742fcf1e5c48fd7 SHA1 bde756cac46fb7a7bb4f12130e98799b1ac1d442 SHA256 4739db1544eeb9d8c12e1b924ac354750386c13e003d2ecaacb354887f23840b
 DIST emul-linux-x86-gtklibs-20071118.tar.bz2 4950478 RMD160 9728c93f2c64ed32f3f692b3d39908278ef7ca25 SHA1 9376fc6c793e88f3068e7ecfd2367794c13239cb SHA256 36f5210689330cd88ad344a995d8f14925b01ae300301bac50be56f26fe58496
 DIST emul-linux-x86-gtklibs-20071121.tar.bz2 4965651 RMD160 285cb37b44bbf0a63b79bdd95a181c9e0a4ea3e1 SHA1 871cb2e4dc843233994ab26a71d0dfc71a2d12ee SHA256 123e3c8ed0aaf97602d3291f3148d0a341342183391fb21c63ed0126147d774d
+DIST emul-linux-x86-gtklibs-20071210.tar.bz2 4959095 RMD160 9c4af2ba44d278a69405559b758e8f17b206dea9 SHA1 440fa23cdf21c5526d23354b0b3eee19f829b115 SHA256 c81a7203d2f836795922aed1f9dd1fb2cd546b1554d2b8a658502d49a7e0e243
 DIST gtk+-1.2.10-r12.tbz2 2255946 RMD160 2ff61d79920f22932c3f415ec572df0727dea0d7 SHA1 dd7b9011a6e52d6c99ddb2fad0b865ac48580f73 SHA256 aad23e5f92b9f2245654f4d120cd56d6e761a208bed55ced597f03939e3556bc
 DIST gtk+-2.10.13.tbz2 7680158 RMD160 f7063e6c3cea0664e7480e26581557fc7d85244e SHA1 92fe0edfdb34f75ab27689c201493a73c264b13b SHA256 fdb72e1ad558298467ab9ff8b417bc016f029eb8906b2052ca34ba2dc1474ada
 DIST gtk+-2.10.6.tbz2 7455485 RMD160 95bb8883cefca38611ea3a89c2585306e918eeaf SHA1 1ee2452a78774839fa49bcc4be764e30b211d909 SHA256 035451318af88820d86a70b09530638928b42dfd0bbd1ae38383231c90653508
@@ -63,10 +61,14 @@ EBUILD emul-linux-x86-gtklibs-20071121.ebuild 1881 RMD160 dcf807e8e40d430da9afac
 MD5 613a2078a73d747052ac8ddd0bd5101e emul-linux-x86-gtklibs-20071121.ebuild 1881
 RMD160 dcf807e8e40d430da9afac98e97f28fed4a2621d emul-linux-x86-gtklibs-20071121.ebuild 1881
 SHA256 354af9167501c3013fd6e17be8c0a65ddd570ec1f08f9a0ef0eaf1957fa60976 emul-linux-x86-gtklibs-20071121.ebuild 1881
-MISC ChangeLog 9342 RMD160 f2bbfed4133af87cf906aabc0801846a3ec93586 SHA1 2a53d6e18c29b1ada283d9895c6abfe77ab814fb SHA256 e7a8a857f665e8c2740b4f981898ba0dcd46b71d13ccaab6d1423f33599892ea
-MD5 813a65ebb21b85898881487def0165b0 ChangeLog 9342
-RMD160 f2bbfed4133af87cf906aabc0801846a3ec93586 ChangeLog 9342
-SHA256 e7a8a857f665e8c2740b4f981898ba0dcd46b71d13ccaab6d1423f33599892ea ChangeLog 9342
+EBUILD emul-linux-x86-gtklibs-20071210.ebuild 1878 RMD160 383ac48be42b392ae9c617e00a3f98a262942a1e SHA1 7d75f04fe3cd58ca2f812ab3f2c5d06caa3454e8 SHA256 59c18ad4ac28d2998184b3dd735a068330d2d6f4efa866bf2b16d9a6911f02f4
+MD5 efcf3e40b6521cc0e25741dfa5d462d6 emul-linux-x86-gtklibs-20071210.ebuild 1878
+RMD160 383ac48be42b392ae9c617e00a3f98a262942a1e emul-linux-x86-gtklibs-20071210.ebuild 1878
+SHA256 59c18ad4ac28d2998184b3dd735a068330d2d6f4efa866bf2b16d9a6911f02f4 emul-linux-x86-gtklibs-20071210.ebuild 1878
+MISC ChangeLog 9483 RMD160 5b94339df3d06790d893c7e23e410c7acca1a548 SHA1 615163e04bcf691cd6fa189268a212ae9485cfc0 SHA256 79fd296bb16a2f9819271114f354f800ede6c4c8edce7305cb68cb743a653ca8
+MD5 7f7d1c0f72d2c547a8117e1751366329 ChangeLog 9483
+RMD160 5b94339df3d06790d893c7e23e410c7acca1a548 ChangeLog 9483
+SHA256 79fd296bb16a2f9819271114f354f800ede6c4c8edce7305cb68cb743a653ca8 ChangeLog 9483
 MISC metadata.xml 226 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d SHA1 1cf50e178ffc19ba9c83c1440bb7affa225058a0 SHA256 ec696441bfd66c7ba1bd8f257fb8b28eebd35325a99a861becdcce4ab22fcb78
 MD5 e862ce865a1f6d796ddca407af1230b0 metadata.xml 226
 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d metadata.xml 226
@@ -98,12 +100,6 @@ SHA256 446b30d80b8a64d04a55c140b232ec18cc535ee4dc0c2e1033eaa054035e5833 files/di
 MD5 68c9ef3970e1882b6138281d5c2f9020 files/digest-emul-linux-x86-gtklibs-20071121 301
 RMD160 860952eae9e53dea578bbb0d6b9d43f6826f2876 files/digest-emul-linux-x86-gtklibs-20071121 301
 SHA256 4e134a6558e54342fbcb0ee683e9f67e686e18ca38bd86c732c3c2f4f6906585 files/digest-emul-linux-x86-gtklibs-20071121 301
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iQCVAwUBR0d8WIBrouQZ9K4FAQJHpwP/YFV5SrbZOmyjuK4N4l78MOdoCmnea8RW
-YQHezNqy02tacu0lHNpUX94GER/e1oo4NLW1j22TV71BsYFEc85TNy0kfYzHVzfY
-poVIIhe4Hhcv+PWgIe1Tg1BwS2fbjIVTZis7U96XQZF5tdIbwTlqAkRMxbBgq7Di
-kieUVH5onFc=
-=gduX
------END PGP SIGNATURE-----
+MD5 937158de186f8289b09c6d0b921b5afe files/digest-emul-linux-x86-gtklibs-20071210 301
+RMD160 5e209de0164cd986c7c952bc3452b70114698f26 files/digest-emul-linux-x86-gtklibs-20071210 301
+SHA256 a276a0e9c132818ac61528819f056661a6717104250c9355e0fd3cbb0deb5f47 files/digest-emul-linux-x86-gtklibs-20071210 301
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071210.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071210.ebuild
new file mode 100644
index 000000000000..f569f8a68830
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071210.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 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-20071210.ebuild,v 1.1 2007/12/11 00:05:38 welp Exp $
+
+inherit emul-linux-x86
+
+LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
+KEYWORDS="-* ~amd64"
+
+IUSE="qt3"
+
+DEPEND=""
+RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114
+	>=app-emulation/emul-linux-x86-xlibs-20071114"
+
+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}
+	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32}
+	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
+}
+
+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}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+
+	# 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/files/digest-emul-linux-x86-gtklibs-20071210 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071210
new file mode 100644
index 000000000000..e261f867ab09
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071210
@@ -0,0 +1,3 @@
+MD5 c6736339957799afc56eebd984135c72 emul-linux-x86-gtklibs-20071210.tar.bz2 4959095
+RMD160 9c4af2ba44d278a69405559b758e8f17b206dea9 emul-linux-x86-gtklibs-20071210.tar.bz2 4959095
+SHA256 c81a7203d2f836795922aed1f9dd1fb2cd546b1554d2b8a658502d49a7e0e243 emul-linux-x86-gtklibs-20071210.tar.bz2 4959095