New emul version; bug 201887

Package-Manager: portage-2.1.3.19

4 files changed, 77 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 07d66be86ed5..b7c678221888 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.55 2007/12/13 21:43:53 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.56 2007/12/14 07:38:04 welp Exp $
+
+*emul-linux-x86-gtklibs-20071214 (14 Dec 2007)
+
+  14 Dec 2007; Peter Weller <welp@gentoo.org>
+  +emul-linux-x86-gtklibs-20071214.ebuild:
+  New emul version; bug 201887
 
   13 Dec 2007; Peter Weller <welp@gentoo.org>
   emul-linux-x86-gtklibs-20071210.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index e17de3ff157e..8f6e438d28ed 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -14,6 +14,7 @@ DIST emul-linux-x86-gtklibs-20071114.tar.bz2 4712580 RMD160 e3e4e1b1ce19ba9498c1
 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 emul-linux-x86-gtklibs-20071214.tar.bz2 4961392 RMD160 8eba2d23b5d64138e7d1eb7f8efe2441d2beac96 SHA1 3a0f37fa10bb3d9b5438fb3e5d78c7a1d4744abf SHA256 5a55aca996ed13585696c99a20dc667c4c74d32f2ae1068a9b07e13c750da571
 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
@@ -65,10 +66,14 @@ EBUILD emul-linux-x86-gtklibs-20071210.ebuild 1877 RMD160 9671b27b60ad504796cf37
 MD5 ae1c0f5cc04c74b3711907480d3f3cf8 emul-linux-x86-gtklibs-20071210.ebuild 1877
 RMD160 9671b27b60ad504796cf378ac8182390c9c6afb5 emul-linux-x86-gtklibs-20071210.ebuild 1877
 SHA256 d8aa8c499d7b1b33950577a80427ddd335a7e4b977bc3ea4b59f64fd24faa711 emul-linux-x86-gtklibs-20071210.ebuild 1877
-MISC ChangeLog 9602 RMD160 968728f304a0f88a4d1401f66c9f2d42cd7a4ba1 SHA1 10191691504a31a884dbb830be92141cf398be9b SHA256 9c99c3d129da43a10db0ea57e18fcaf2cbd40a14df84925b84c7051089b49cad
-MD5 6e2bba692d14930cc62adac2384224f1 ChangeLog 9602
-RMD160 968728f304a0f88a4d1401f66c9f2d42cd7a4ba1 ChangeLog 9602
-SHA256 9c99c3d129da43a10db0ea57e18fcaf2cbd40a14df84925b84c7051089b49cad ChangeLog 9602
+EBUILD emul-linux-x86-gtklibs-20071214.ebuild 1878 RMD160 946ea26807ea51dcac8b7955ae4dbf353ec732cd SHA1 a1fdf96d72fa3b9437e35cf5e1c50ac2173164d7 SHA256 68a69221acda84c3608e0963aba2fb3ea70b5df6d13b1cc65077fceb53900982
+MD5 79a60aace90568de38ca2c62f5c3e982 emul-linux-x86-gtklibs-20071214.ebuild 1878
+RMD160 946ea26807ea51dcac8b7955ae4dbf353ec732cd emul-linux-x86-gtklibs-20071214.ebuild 1878
+SHA256 68a69221acda84c3608e0963aba2fb3ea70b5df6d13b1cc65077fceb53900982 emul-linux-x86-gtklibs-20071214.ebuild 1878
+MISC ChangeLog 9771 RMD160 5f7098905ab43e37973b9cc65ad95ba184034c60 SHA1 0936abacfff4ca7d2f704b9154eb03b5377610cf SHA256 86cfc22ecc6f771fc870c58d77eba3c9022c103c19c008684cf1ae3c3c09a7e6
+MD5 6bcf7f073c765b72a7ce43695803ab63 ChangeLog 9771
+RMD160 5f7098905ab43e37973b9cc65ad95ba184034c60 ChangeLog 9771
+SHA256 86cfc22ecc6f771fc870c58d77eba3c9022c103c19c008684cf1ae3c3c09a7e6 ChangeLog 9771
 MISC metadata.xml 226 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d SHA1 1cf50e178ffc19ba9c83c1440bb7affa225058a0 SHA256 ec696441bfd66c7ba1bd8f257fb8b28eebd35325a99a861becdcce4ab22fcb78
 MD5 e862ce865a1f6d796ddca407af1230b0 metadata.xml 226
 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d metadata.xml 226
@@ -103,3 +108,6 @@ SHA256 4e134a6558e54342fbcb0ee683e9f67e686e18ca38bd86c732c3c2f4f6906585 files/di
 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
+MD5 fcd0690a68a3f974ac19d02e62561314 files/digest-emul-linux-x86-gtklibs-20071214 301
+RMD160 dfb7417d3e4a998cb41efe5be01b8e32aeb3a30f files/digest-emul-linux-x86-gtklibs-20071214 301
+SHA256 69f0a7f34eda899d6cccf2b6648cd0199322667767c5e2804effb88e790cc022 files/digest-emul-linux-x86-gtklibs-20071214 301
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071214.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071214.ebuild
new file mode 100644
index 000000000000..cb25a4c4e123
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071214.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-20071214.ebuild,v 1.1 2007/12/14 07:38:04 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-20071214 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071214
new file mode 100644
index 000000000000..efda0b569be0
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071214
@@ -0,0 +1,3 @@
+MD5 70a4804a64153ecc1f10ce8833c76269 emul-linux-x86-gtklibs-20071214.tar.bz2 4961392
+RMD160 8eba2d23b5d64138e7d1eb7f8efe2441d2beac96 emul-linux-x86-gtklibs-20071214.tar.bz2 4961392
+SHA256 5a55aca996ed13585696c99a20dc667c4c74d32f2ae1068a9b07e13c750da571 emul-linux-x86-gtklibs-20071214.tar.bz2 4961392