Bump gtk to version 2.8.8, add gtk-engines-qt.

Package-Manager: portage-2.1_pre6-r2

7 files changed, 29 insertions, 31 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 4364b1a1c6c5..58a34dc717bc 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 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.19 2006/03/09 01:50:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.20 2006/03/17 16:11:41 herbs Exp $
+
+*emul-linux-x86-gtklibs-2.8.8 (17 Mar 2006)
+
+  17 Mar 2006; Herbie Hopkins <herbs@gentoo.org>
+  -emul-linux-x86-gtklibs-2.1.ebuild, -emul-linux-x86-gtklibs-2.2.ebuild,
+  +emul-linux-x86-gtklibs-2.8.8.ebuild:
+  Bump gtk to version 2.8.8, add gtk-engines-qt.
 
   09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   emul-linux-x86-gtklibs-2.1.ebuild, emul-linux-x86-gtklibs-2.2.ebuild,
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 27fa5c1b6c10..e6bb10eb2a9c 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
+
 MD5 f7c68f2994307a2951e232d5bbbf1989 .ChangeLog.swp 16384
 RMD160 235bf4a52e751d639cd27bd4e70191ba60673b5f .ChangeLog.swp 16384
 SHA256 e7200c7004562cfef93da1c5b37cd65b452fc6da00427e929437d2779c5f97e9 .ChangeLog.swp 16384
@@ -22,3 +25,10 @@ SHA256 ca07ffba3c41994c96fae1596ef72e23718e5b5e4042acea834ddf76aa7ec754 files/di
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
 SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEGt/J2G5bA0cA/ScRApn3AJ40wv3SvFxhO1Nbzreon8SnQRBzaQCgtYgo
+jlWULyhGU5IHPFXQlHlPxho=
+=VF68
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.1.ebuild
deleted file mode 100644
index e9716fd2e883..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 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-2.1.ebuild,v 1.5 2006/03/09 01:50:09 flameeyes Exp $
-
-DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/emul-linux-x86-gtklibs-${PV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-2.0
-	>=app-emulation/emul-linux-x86-baselibs-2.0"
-
-RESTRICT="nostrip"
-
-src_install() {
-	cp -RPvf ${WORKDIR}/* ${D}/
-	doenvd ${FILESDIR}/50emul-linux-x86-gtklibs
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.2.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.8.8.ebuild
index 2393a87d80b2..5e35ca8a565d 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.2.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-2.2.ebuild,v 1.4 2006/03/09 01:50:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.8.8.ebuild,v 1.1 2006/03/17 16:11:41 herbs Exp $
 
 DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -9,17 +9,21 @@ HOMEPAGE="http://www.gentoo.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE=""
+KEYWORDS="-* ~amd64"
+IUSE="qt"
 
 S="${WORKDIR}"
 
 RDEPEND=">=app-emulation/emul-linux-x86-xlibs-2.0
-	>=app-emulation/emul-linux-x86-baselibs-2.0"
+	>=app-emulation/emul-linux-x86-baselibs-2.5
+	qt? >=app-emulation/emul-linux-x86-qtlibs-3.4.4"
 
 RESTRICT="nostrip"
 
 src_install() {
+	# Avoid dep on qtlibs if qt support not required
+	use !qt && rm -f "${WORKDIR}/emul/linux/x86/usr/lib/gtk-2.0/2.4.0/engines/libqtengine.so"
+
 	cp -RPvf ${WORKDIR}/* ${D}/
 	doenvd ${FILESDIR}/50emul-linux-x86-gtklibs
 }
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.1 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.1
deleted file mode 100644
index 0d022f7c6960..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 862aafe1c3476fa27453782631e50f5d emul-linux-x86-gtklibs-2.1.tar.bz2 2429609
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.2 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.2
deleted file mode 100644
index 299620ca5d37..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 931c75e0c6137542fa8f73a854ee1832 emul-linux-x86-gtklibs-2.2.tar.bz2 2563576
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.8.8 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.8.8
new file mode 100644
index 000000000000..843686ba1437
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.8.8
@@ -0,0 +1,3 @@
+MD5 0ae3207957226d4a5d3aa6a41bcfdb81 emul-linux-x86-gtklibs-2.8.8.tar.bz2 2892105
+RMD160 7bddf9725383e69519e4c70cd24750a9a806ae4f emul-linux-x86-gtklibs-2.8.8.tar.bz2 2892105
+SHA256 f48bfe53cb064e68cebb48920d8d54df7e215c6b860ec34cd56b4a27f2047b90 emul-linux-x86-gtklibs-2.8.8.tar.bz2 2892105