only depend on qtlibs if USE=qt is given

Package-Manager: portage-2.1.2-r9

4 files changed, 75 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 11097e5b2552..f8e49e33e5ac 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2007/02/27 12:18:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.40 2007/02/28 16:45:29 blubb Exp $
+
+*emul-linux-x86-gtklibs-10.0-r1 (28 Feb 2007)
+
+  28 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-gtklibs-10.0.ebuild,
+  +emul-linux-x86-gtklibs-10.0-r1.ebuild:
+  only depend on qtlibs if USE=qt is given
 
   27 Feb 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-gtklibs-10.0.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 59c228efa132..45c29f22dc7f 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -15,6 +15,10 @@ DIST gtk-engines-qt-0.7-r1.tbz2 135604 RMD160 00cd362aac0244a36634346c2801fd7c5c
 DIST gtk-engines-xfce-2.2.8-r1.tbz2 59465 RMD160 2436b2356e234886bd19efa4212f2378ac7058d0 SHA1 8a878ce632cddca18b1c95ad28a9342af5eba927 SHA256 c84b593a45356efee72bd085bb6b2fd25ce4dc3758c0901862a231d5db204e03
 DIST imlib-1.9.14-r3.tbz2 604079 RMD160 8e2d84cd870f6a4a10681e26c38bcdc9c1c80edc SHA1 01682a815c2e23cf7dc4021a219edef9f364f9f6 SHA256 0efd7f15178f5b987ddf2017fda1ba8d5633699ad83186f5cf87c77268b9a814
 DIST pango-1.14.9.tbz2 632667 RMD160 4194800b2f85623be8f3e7d995efd4e5fd21421d SHA1 21b8c85ae48197e1b2288fe6235b0019cabdef2e SHA256 c97cf00ee1e988f54f70b765f4e87048f56665ab9dd239ceab4e7625e7b6e1a0
+EBUILD emul-linux-x86-gtklibs-10.0-r1.ebuild 2111 RMD160 bed6d9933116334d1f8aa053487687af6c8c9198 SHA1 d32d75713bb9f5adc22f3bf525bba95e39100f8b SHA256 14659526de361a861aba489acc3501079eafe5dca46b1947140147bfe5405121
+MD5 c874f6c982e51d22448e91b2cc25b388 emul-linux-x86-gtklibs-10.0-r1.ebuild 2111
+RMD160 bed6d9933116334d1f8aa053487687af6c8c9198 emul-linux-x86-gtklibs-10.0-r1.ebuild 2111
+SHA256 14659526de361a861aba489acc3501079eafe5dca46b1947140147bfe5405121 emul-linux-x86-gtklibs-10.0-r1.ebuild 2111
 EBUILD emul-linux-x86-gtklibs-10.0.ebuild 2035 RMD160 e39e078140187f9b59235243d3ba582f7bc7c8a0 SHA1 22277efa8a22f5bd9bceefbb112e158436d627cb SHA256 5a16399bc3ec46dbaa179a11b8607f9d7343f9f61317afa799e79f6b1d5c0c58
 MD5 aeceb68965db2d8a14eb6fde000518d7 emul-linux-x86-gtklibs-10.0.ebuild 2035
 RMD160 e39e078140187f9b59235243d3ba582f7bc7c8a0 emul-linux-x86-gtklibs-10.0.ebuild 2035
@@ -35,10 +39,10 @@ EBUILD emul-linux-x86-gtklibs-2.8.8.ebuild 1036 RMD160 d5c6101ac1718795085478a0a
 MD5 5568a53572590115d285168e9166796d emul-linux-x86-gtklibs-2.8.8.ebuild 1036
 RMD160 d5c6101ac1718795085478a0a8768aac1656b54a emul-linux-x86-gtklibs-2.8.8.ebuild 1036
 SHA256 e2a8aba1ef3655f81888016f00e5ffe8aaabf880e3ece3cfe939d981bf2f2eb0 emul-linux-x86-gtklibs-2.8.8.ebuild 1036
-MISC ChangeLog 7069 RMD160 caefcc76ccbfc9d090fe5609091670e2b92cd86d SHA1 a460afc8655da5507fac479e5e32b4ccd7c61f1b SHA256 5979c10fcb5b14885ac215d92faa87d9c6b96f76b4195fb58cfee293841de68e
-MD5 6236fdba061ca85066e19c725a6627fb ChangeLog 7069
-RMD160 caefcc76ccbfc9d090fe5609091670e2b92cd86d ChangeLog 7069
-SHA256 5979c10fcb5b14885ac215d92faa87d9c6b96f76b4195fb58cfee293841de68e ChangeLog 7069
+MISC ChangeLog 7290 RMD160 724fdd9125a49d40dff73a4356de24b35d61b7b8 SHA1 539a031b417ec7c223e6289925ed29cd3056134d SHA256 c1e92db1d721ee79e231b4f42d61cda8253721def4966dc64466d3ece712101a
+MD5 2dcdb071211180c8f722391d29529ac9 ChangeLog 7290
+RMD160 724fdd9125a49d40dff73a4356de24b35d61b7b8 ChangeLog 7290
+SHA256 c1e92db1d721ee79e231b4f42d61cda8253721def4966dc64466d3ece712101a ChangeLog 7290
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
@@ -46,6 +50,9 @@ SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata
 MD5 8a4dcbc139f94fa894ce4aace7231b0c files/digest-emul-linux-x86-gtklibs-10.0 2178
 RMD160 f931531dc2449c582166305dbcf458b83ac307dd files/digest-emul-linux-x86-gtklibs-10.0 2178
 SHA256 569692c6646af64db33df462719a03eda676efa4860c44dcfac729d328a6cda5 files/digest-emul-linux-x86-gtklibs-10.0 2178
+MD5 8a4dcbc139f94fa894ce4aace7231b0c files/digest-emul-linux-x86-gtklibs-10.0-r1 2178
+RMD160 f931531dc2449c582166305dbcf458b83ac307dd files/digest-emul-linux-x86-gtklibs-10.0-r1 2178
+SHA256 569692c6646af64db33df462719a03eda676efa4860c44dcfac729d328a6cda5 files/digest-emul-linux-x86-gtklibs-10.0-r1 2178
 MD5 12f9f1ccb135934a488587a4f25e9079 files/digest-emul-linux-x86-gtklibs-2.10.6.3 301
 RMD160 796539fdccf4065be69da2c2f87f21332420c8f4 files/digest-emul-linux-x86-gtklibs-2.10.6.3 301
 SHA256 c767e3e87ed4fad8b9df7a972b11d65c1bdc62d427914d3767635e80c51b57b6 files/digest-emul-linux-x86-gtklibs-2.10.6.3 301
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
new file mode 100644
index 000000000000..e524c8e0a094
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-10.0-r1.ebuild,v 1.1 2007/02/28 16:45:29 blubb Exp $
+
+inherit emul-libs
+
+SRC_URI="mirror://gentoo/atk-1.12.3.tbz2
+	mirror://gentoo/cairo-1.2.4.tbz2
+	mirror://gentoo/gtk+-1.2.10-r12.tbz2
+	mirror://gentoo/gtk+-2.10.6.tbz2
+	mirror://gentoo/gtk-engines-2.8.2.tbz2
+	qt? ( mirror://gentoo/gtk-engines-qt-0.7-r1.tbz2 )
+	mirror://gentoo/gtk-engines-xfce-2.2.8-r1.tbz2
+	mirror://gentoo/imlib-1.9.14-r3.tbz2
+	mirror://gentoo/pango-1.14.9.tbz2"
+
+LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
+KEYWORDS="-* ~amd64"
+
+IUSE="qt"
+
+DEPEND=""
+RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.2
+	qt? ( >=app-emulation/emul-linux-x86-qtlibs-10.0 )
+	>=app-emulation/emul-linux-x86-xlibs-10.0"
+
+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-libs_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}
+
+	[[ -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so ]] && rm -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so
+}
+
+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
+	else
+		ewarn "You'll have to run the following command after chrooting into ${ROOT}:"
+		ewarn "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
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-10.0 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-10.0-r1
index 0e5c3079ae4c..0e5c3079ae4c 100644
--- a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-10.0
+++ b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-10.0-r1