fixed pango/gtk+ conf file seperation, bug 199201

Package-Manager: portage-2.1.3.17

4 files changed, 85 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index dd3f126bfdf8..7ca961201ba8 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.49 2007/11/15 07:21:38 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.50 2007/11/18 05:56:18 kingtaco Exp $
+
+*emul-linux-x86-gtklibs-20071118 (18 Nov 2007)
+
+  18 Nov 2007; Mike Doty <kingtaco@gentoo.org>
+  +emul-linux-x86-gtklibs-20071118.ebuild:
+  fixed pango/gtk+ conf file seperation, bug 199201
 
   15 Nov 2007; Mike Doty <kingtaco@gentoo.org>
   emul-linux-x86-gtklibs-20071114.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 38a2726f05a7..189f4f2b75b1 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -11,6 +14,7 @@ DIST emul-linux-x86-gtklibs-2.10.6.3.tar.bz2 3121509 RMD160 0e5ca2614af2664ae983
 DIST emul-linux-x86-gtklibs-2.3.tar.bz2 2690115 RMD160 d5a16f34cd9f8c3fd9b4b9ca069ebd4fbeaa970d SHA1 1b54438a94b09f1498118fb21d87f4267bb70353 SHA256 10b896194a0d1a35fec449620351a02cd333951c0c8bf35432d9217639198f10
 DIST emul-linux-x86-gtklibs-2.8.8.tar.bz2 2892105 RMD160 7bddf9725383e69519e4c70cd24750a9a806ae4f SHA1 15ab80b48fbb3e7b12ebba5fb85bef9abe4c17d5 SHA256 f48bfe53cb064e68cebb48920d8d54df7e215c6b860ec34cd56b4a27f2047b90
 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 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
@@ -50,10 +54,14 @@ EBUILD emul-linux-x86-gtklibs-20071114.ebuild 1820 RMD160 0bbaaff2d46b0072835e8b
 MD5 4069a80fd2897a228a14b2dfe5e810a8 emul-linux-x86-gtklibs-20071114.ebuild 1820
 RMD160 0bbaaff2d46b0072835e8badc1bdf0e176b180f4 emul-linux-x86-gtklibs-20071114.ebuild 1820
 SHA256 7255db2ce0d2b03dc03e3ebf691000af1060ef6841139c30c3ac8664cc191655 emul-linux-x86-gtklibs-20071114.ebuild 1820
-MISC ChangeLog 8698 RMD160 e40e9f6b31c8eca28a8fde24500905d11d2421d9 SHA1 3e1af9a4e9150444e80912fba37185a56ca6d928 SHA256 337fc7cc8239a4e80320ab3bac8c72942684f6d5864adad1e9ed74f4c1eab161
-MD5 d449eb531401e4f86d831c95b4e72fd0 ChangeLog 8698
-RMD160 e40e9f6b31c8eca28a8fde24500905d11d2421d9 ChangeLog 8698
-SHA256 337fc7cc8239a4e80320ab3bac8c72942684f6d5864adad1e9ed74f4c1eab161 ChangeLog 8698
+EBUILD emul-linux-x86-gtklibs-20071118.ebuild 1820 RMD160 8331d87f80b0f3b79173d7f19b5fe3c2387ef535 SHA1 1d643379e031ebd1a7bf77f78b68b2bda4424198 SHA256 b953cbb500a95f5210c603298b4e889af0da088141847199e4b1c3efe58436ba
+MD5 4a75c614e6bae3e4ed98ea4a84be58f2 emul-linux-x86-gtklibs-20071118.ebuild 1820
+RMD160 8331d87f80b0f3b79173d7f19b5fe3c2387ef535 emul-linux-x86-gtklibs-20071118.ebuild 1820
+SHA256 b953cbb500a95f5210c603298b4e889af0da088141847199e4b1c3efe58436ba emul-linux-x86-gtklibs-20071118.ebuild 1820
+MISC ChangeLog 8889 RMD160 f773df20dbaef3cedc89c744d2b5d7ab93335c77 SHA1 da8b5bbc29df86b65b589f3bb84d4e5cf5f9b314 SHA256 9c4119df1d97b595b22b37d935a1a49f59f8be723b26a39dd83f581b34863a5d
+MD5 195573a715febbe59b574ba690d50b2e ChangeLog 8889
+RMD160 f773df20dbaef3cedc89c744d2b5d7ab93335c77 ChangeLog 8889
+SHA256 9c4119df1d97b595b22b37d935a1a49f59f8be723b26a39dd83f581b34863a5d ChangeLog 8889
 MISC metadata.xml 226 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d SHA1 1cf50e178ffc19ba9c83c1440bb7affa225058a0 SHA256 ec696441bfd66c7ba1bd8f257fb8b28eebd35325a99a861becdcce4ab22fcb78
 MD5 e862ce865a1f6d796ddca407af1230b0 metadata.xml 226
 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d metadata.xml 226
@@ -79,3 +87,15 @@ SHA256 ca07ffba3c41994c96fae1596ef72e23718e5b5e4042acea834ddf76aa7ec754 files/di
 MD5 f0a9b954bee023435da109d6592ef3b9 files/digest-emul-linux-x86-gtklibs-20071114 301
 RMD160 e0d8bede2b88a0fa074ca6adb60f440a9fccd16e files/digest-emul-linux-x86-gtklibs-20071114 301
 SHA256 a9be2fce9b7f99671a859652e210a2131a744c3dbfd207ca3a311e872c43291d files/digest-emul-linux-x86-gtklibs-20071114 301
+MD5 1aea622b162d51f437b101b5a5746646 files/digest-emul-linux-x86-gtklibs-20071118 301
+RMD160 34173cbc148154d2c04de773087f13bd3d3af7f2 files/digest-emul-linux-x86-gtklibs-20071118 301
+SHA256 446b30d80b8a64d04a55c140b232ec18cc535ee4dc0c2e1033eaa054035e5833 files/digest-emul-linux-x86-gtklibs-20071118 301
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iQCVAwUBRz/UCYBrouQZ9K4FAQIQSwQA6FPAynpQ+RJm4+1ZlPOLV1fF9FeRsPBY
+DsNwr+D4t/Ih/7YFnYeVLPHAiAYWwVcrdgG9dHF6hICUP4ynDV7Sp8i96Zfgzc7J
+sttIFWoVHxmnLqzNvkr+S+tip9z5d1ZEQBLj8tXx3WCtAcQjNKhIjIZ4EJk5oEb0
+mYpwj9+FlOc=
+=jp3A
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071118.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071118.ebuild
new file mode 100644
index 000000000000..dd16e3561beb
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071118.ebuild
@@ -0,0 +1,51 @@
+# 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-20071118.ebuild,v 1.1 2007/11/18 05:56:18 kingtaco 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"
+	ewarn "If you have problems with fonts and warnings from 32bit programs, try this:"
+	ewarn "gdk-pixbuf-query-loaders32 >> /etc/gtk+-2.0/gdk-pixbuf.loaders"
+	ewarn "pango-querymodules32 >> /etc/pango/pango.modules"
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071118 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071118
new file mode 100644
index 000000000000..de2a45fede9b
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-20071118
@@ -0,0 +1,3 @@
+MD5 d3a126c7087d5db3b6c146a8e4ac1b39 emul-linux-x86-gtklibs-20071118.tar.bz2 4950478
+RMD160 9728c93f2c64ed32f3f692b3d39908278ef7ca25 emul-linux-x86-gtklibs-20071118.tar.bz2 4950478
+SHA256 36f5210689330cd88ad344a995d8f14925b01ae300301bac50be56f26fe58496 emul-linux-x86-gtklibs-20071118.tar.bz2 4950478