Fix gtk+ slot deps

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 28 insertions, 22 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index a9db4aebd0e7..eb6a766c3470 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.209 2011/03/28 22:37:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.210 2011/03/30 11:12:30 angelos Exp $
+
+  30 Mar 2011; Christoph Mende <angelos@gentoo.org> distcc-2.18.3-r10.ebuild,
+  distcc-3.0-r4.ebuild, distcc-3.1-r4.ebuild:
+  Fix gtk+ slot deps
 
   28 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> distcc-3.1-r5.ebuild:
   Pin gtk+ to slot 2.
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 7ff535e6d4a9..a2901b093e9b 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 2.18-r1/conf 1345 RMD160 6921e75f3d71ecebf66ebf4356482655ff1d0a19 SHA1 89aa69c5cc8a645fe3ff11282cd230c3a3dd898a SHA256 c48a04bd789d38682c8e1003f891a4428e5bb457696578afe56a913ec003fdef
 AUX 2.18-r1/init 927 RMD160 11638f1be4f1a55414517e9982b3a2ee508b9b9d SHA1 6456b0af8e63112258fd401afc1abe7b578004cb SHA256 3b7343b659ce864da8b730d2bf2c221de6446d6afc935f7686d85fc8d0983167
@@ -28,16 +28,16 @@ AUX distcc-march-native.patch 934 RMD160 29908d5b5c4622285a78f221b2633e3ee495a64
 DIST distcc-2.18.3.tar.bz2 341601 RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d SHA1 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
 DIST distcc-3.0.tar.bz2 582700 RMD160 1e187fe09129dcc6e561bfb0cd0db9a43619acca SHA1 90cea1d7500e95d3c698e6ab9b9536a946f62824 SHA256 bb6f5674b619ef1438da67739d982e8a6b11e01f748708e0fcbe371c02f020fe
 DIST distcc-3.1.tar.bz2 588820 RMD160 82229c230e6917b0df7db275460579b02dbf6b60 SHA1 30663e8ff94f13c0553fbfb928adba91814e1b3a SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
-EBUILD distcc-2.18.3-r10.ebuild 5141 RMD160 6115c9395709bb419d72f08b4395f5a95dbf8214 SHA1 cad3896fc82fb5b49574a164f8d9f8e8fe2d83ca SHA256 ea3c6baa9511c123299baf17353d05dac2e98493db0062e5154eed4bac2c8406
-EBUILD distcc-3.0-r4.ebuild 4590 RMD160 624db18d0f56a00181e2d2897020f8e6e082fe82 SHA1 6d87b0491d21d599da3e9c56e329009b6a82a2e2 SHA256 417ffc3783df12916ff68402072c2684d46579b082dce14b567c91f3df0356e1
-EBUILD distcc-3.1-r4.ebuild 4482 RMD160 a5b1333eba02b37c4f93580aae83e09884708679 SHA1 40f75635d69d048bd4688e8f684e8b0f880324ca SHA256 3ba74bd42f4bed7b686748a7931d1be63d80ef7bc413c84b0dff3373eb9df8ac
+EBUILD distcc-2.18.3-r10.ebuild 5137 RMD160 508cd0415759109afabf5a1808a9f8cb9270b668 SHA1 44abc5cb3306a4c36723cbd2bae77cfce65020ba SHA256 8a6295e903e6950a64a739ec3ea8138616d7ef4d0dcd60b12af278b228bcf34c
+EBUILD distcc-3.0-r4.ebuild 4593 RMD160 c9919883117733788883069757230bbb108744f4 SHA1 5539be07ad4c3fb49064cb4ee846ce8f80be78f4 SHA256 45780c57a309a9dba22d33514c8b1cc30abf77e19cd0b2744d764ff1fff602c6
+EBUILD distcc-3.1-r4.ebuild 4477 RMD160 407effb3ed2a3fa61fba0b54666df8e6204cfed2 SHA1 e631152a676bfb0dfdeee0a0686ddf8e6af9621b SHA256 1ed79bea3988a929965944ee4fd9b387e73680340104cec80ff2c9fc4c8397c0
 EBUILD distcc-3.1-r5.ebuild 4735 RMD160 06f3e02b81546b3d71ca770f91d11755e2c4b046 SHA1 8fd61ea57b14a57273c124ad3db4bbe03557f8ba SHA256 f23dfa154325a758b56c51906ce972b5dc766e6c4da8cda721c932747d429c1c
-MISC ChangeLog 37795 RMD160 e77b280479666f1e3c494ff2d8a367b20249289f SHA1 c6e96e4a75fba80b33c9c3a076a700f4d4d48676 SHA256 f6fb92365189d62b0ee956d7c62a4c1766510c9e80a419401ba98d620f3e1daf
+MISC ChangeLog 37945 RMD160 194b1ca1f7a3af2385425f98a65b0432cbc19b94 SHA1 37e7a8590bcc78dc01356e72be4d4abcd22cb878 SHA256 7da6e03d65adbe95b3f060422ecd38826cb6188360cc9e4d0a1065a40acdf423
 MISC metadata.xml 372 RMD160 39cf4903218a1394a2dbbe5b4b5f53bda0b3791a SHA1 f68a302b90535835e7119f9701d445a5dfc05129 SHA256 25318fa35e9a311cf00b5ce32d90e524e17599eb8c091de96547030a647e80f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2RDb0ACgkQ1fmVwcYIWAaKaACgnKF4QFRNnxHreaC0PBNVz1WK
-3PkAniN/LJpkO50o250WdVyRA+42yYWa
-=/V07
+iF4EAREIAAYFAk2TECMACgkQmWq1bYTyC0NyFQD+IvDWtmRDW+JmuiIqGBLSop1g
+0xBxeyXoXCvB/CC3D08A/jMmrFiHV0gn/VnKbGwID+iD8G2HGgD2x6xGyCME0kqr
+=Xvtj
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-2.18.3-r10.ebuild b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
index d966ddd38d1b..13d783e70b43 100644
--- a/sys-devel/distcc/distcc-2.18.3-r10.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r10.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.12 2011/02/06 11:32:25 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r10.ebuild,v 1.13 2011/03/30 11:12:30 angelos Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
 
+EAPI=1
 inherit eutils flag-o-matic toolchain-funcs
 
 PATCHLEVEL="2.18"
@@ -24,15 +25,15 @@ DEPEND=">=sys-devel/gcc-config-1.3.1
 	gtk? ( dev-util/pkgconfig )"
 RDEPEND="
 	gnome? (
-		>=x11-libs/gtk+-2.0.0
+		x11-libs/gtk+:2
 		>=gnome-base/libgnome-2.0.0
 		>=gnome-base/libgnomeui-2.0.0.0
-		>=gnome-base/libglade-2.0.0
+		gnome-base/libglade:2.0
 		x11-libs/pango
-		>=gnome-base/gconf-2.0.0
+		>=gnome-base/gconf-2.0.0:2
 	)
 	gtk? (
-		>=x11-libs/gtk+-2.0.0
+		x11-libs/gtk+:2
 		x11-libs/pango
 	)
 	selinux? ( sec-policy/selinux-distcc )"
diff --git a/sys-devel/distcc/distcc-3.0-r4.ebuild b/sys-devel/distcc/distcc-3.0-r4.ebuild
index 64061104ee0c..f4ce067ae83e 100644
--- a/sys-devel/distcc/distcc-3.0-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.0-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v 1.12 2009/03/13 17:10:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v 1.13 2011/03/30 11:12:30 angelos Exp $
 
+EAPI=1
 inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="a program to distribute compilation of C code across several machines on a network"
@@ -21,11 +22,11 @@ RDEPEND=">=dev-lang/python-2.4
 	gnome? (
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
-		>=x11-libs/gtk+-2
+		x11-libs/gtk+:2
 		x11-libs/pango
 	)
 	gtk? (
-		>=x11-libs/gtk+-2
+		x11-libs/gtk+:2
 	)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/sys-devel/distcc/distcc-3.1-r4.ebuild b/sys-devel/distcc/distcc-3.1-r4.ebuild
index 77eca6775146..d94bfa03b458 100644
--- a/sys-devel/distcc/distcc-3.1-r4.ebuild
+++ b/sys-devel/distcc/distcc-3.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r4.ebuild,v 1.8 2009/10/19 21:09:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r4.ebuild,v 1.9 2011/03/30 11:12:30 angelos Exp $
 
 EAPI="2"
 inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs
@@ -22,11 +22,11 @@ RDEPEND=">=dev-lang/python-2.4
 	gnome? (
 		>=gnome-base/libgnome-2
 		>=gnome-base/libgnomeui-2
-		>=x11-libs/gtk+-2
+		x11-libs/gtk+:2
 		x11-libs/pango
 	)
 	gtk? (
-		>=x11-libs/gtk+-2
+		x11-libs/gtk+:2
 	)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"