Fix GTK+ depends.

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

6 files changed, 42 insertions, 22 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 81ccf9809ced..135286b8bdce 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.347 2012/05/21 22:56:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.348 2012/05/21 23:03:14 cardoe Exp $
+
+  21 May 2012; Doug Goldstein <cardoe@gentoo.org>
+  nvidia-drivers-173.14.34.ebuild, nvidia-drivers-295.40.ebuild,
+  nvidia-drivers-295.49.ebuild, nvidia-drivers-295.53.ebuild:
+  Fix GTK+ depends.
 
   21 May 2012; Doug Goldstein <cardoe@gentoo.org>
   -nvidia-drivers-290.10.ebuild, -nvidia-drivers-290.10-r2.ebuild,
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index fd3ab77e580a..2ab3c56574c7 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -36,10 +36,10 @@ DIST NVIDIA-Linux-x86_64-295.49.run 58521195 RMD160 9873ed7fadad86f97843ef222d72
 DIST NVIDIA-Linux-x86_64-295.53.run 58522001 RMD160 1b6018b13f0235df28196e653757dcdbeaa4f46e SHA1 9ac7f37c9987e0b347c5f9d9c1658122212de57c SHA256 4525e994a0d0a8cd776415401423e7de3985923637642955c3fe50a3d047d4ca
 DIST NVIDIA-Linux-x86_64-96.43.20-pkg2.run 14572507 RMD160 51d5838d1c0e63a1abf479d155e4df3a854d98f6 SHA1 b5ab8b3e9f06418720971187d53837db90af5f8a SHA256 562107a262e250b836966e29851628f6162ee2857d53252221c780d9b201de18
 EBUILD nvidia-drivers-173.14.31.ebuild 15621 RMD160 0ad8f5c23d1eb8d28b8bc3f95c89d543a68f93af SHA1 af9213e04544cf3f68b054e879e40a17aebd4a04 SHA256 7b8b6b1232af634b0afd147be7fa6b14f64f89025b58a790c02186a48942d5b2
-EBUILD nvidia-drivers-173.14.34.ebuild 16336 RMD160 2f82d160c9aeba6728d269706926f7f06ed66048 SHA1 71be0c28e9f5dfa3be5eb76c4b024a41718f453c SHA256 77e75b1123107960a70b64b245c956ad0689e15c494278b52f42afcda71653b4
-EBUILD nvidia-drivers-295.40.ebuild 18470 RMD160 76a325c15e8072c9983a5c486cae08a5a91645e2 SHA1 bb64bb6b585f8060cd96e8404e6d3875b747c321 SHA256 7518d061ed7dad9fec79e352f70acc6b33458df9ea82b94c4d2e9b62e91a9bb2
-EBUILD nvidia-drivers-295.49.ebuild 18563 RMD160 62fc426020443046698b61a9aa0c2a1ee66266f0 SHA1 1a913c20d51f40576937867667f937adb5c61857 SHA256 8972417a371429e080a05a1cc23ddb600cc2db8c5a0eabbe1893b8ae0bc888fc
-EBUILD nvidia-drivers-295.53.ebuild 18450 RMD160 e6c0cb55ca5e1dbdb405969d429a076619a860ce SHA1 22faf0509f2d41d04e61effdc362592c47649251 SHA256 d68e5de22ecc14bc625c5d53056e1491b59c49313d95890439caca7b2b04154f
+EBUILD nvidia-drivers-173.14.34.ebuild 16198 RMD160 df100554c27b37431f481627ac9a8471e9d0be53 SHA1 f3a7093145f1d1ec5237a9ca7214b2f8f93c32c2 SHA256 d5c1d25b3b9d9d8bab9fefa83a73b861cd92e121b2496873913ee734982e7a93
+EBUILD nvidia-drivers-295.40.ebuild 18582 RMD160 d01bfc2246c076da5eeda549f8c5e3ae74eec438 SHA1 d7d22118857f3b5a2af1c8b4f6bdf0411f99e9d5 SHA256 3640fa382f286e7fe7dfdb26e6ae7b6ff2d3359a19a8a5e6a355ad014462086f
+EBUILD nvidia-drivers-295.49.ebuild 18675 RMD160 db0e08f49f53499d7eb852b479e41daf36d7e013 SHA1 f7b458e54120539540cf5f306aeb6d5ad2995341 SHA256 d410e00960621f5c0d9670a03110da1cf1909528941449b39cf0bb01dcefc825
+EBUILD nvidia-drivers-295.53.ebuild 18562 RMD160 797495b2e75f1248ee6c67615a3cb47c79ff14fb SHA1 9b83644dd3fc8f79fddc004326c0fdc71425527d SHA256 71ef6d5e695bff2920d5ff0db1a2df8fb82bdedba4c0d97d90f35853837050ab
 EBUILD nvidia-drivers-96.43.20.ebuild 15606 RMD160 021845276b0cdec4989351d430ce9dfb5034f3e4 SHA1 f9cd2e84e9ae4a9afffa439a1db1366058792e75 SHA256 7343d4e7ec6b4354efabe420ba6413e5e369fe6897eee51cbb3ae49b39d31b13
-MISC ChangeLog 74120 RMD160 54e30ed904b78f11b6b622058032065e661f4737 SHA1 978706f73fed7346d318d32c46f594d874f44cb0 SHA256 5b9b32d5c60a32476c7cacba9d443e1db38df9d390abc2f2ba6e4f338587ffe1
+MISC ChangeLog 74318 RMD160 64b4b8a2a1596fc085a8c7720e4b08becafb3ee7 SHA1 4fcecf369b68e6bd490e9aed3caef686d7af5c8a SHA256 7008ac16345ef0cb8b86aba3ba39599d27c4d91162da9f630fb91dd236b89901
 MISC metadata.xml 805 RMD160 2dba407d1bd596807d7a165b091e2d10838d7a30 SHA1 c3b311bacd6d1c916f70265369ff6263a38c411c SHA256 86490388b274c1b62b659755b80bd96f82625ed8a35c0a0d83992eee3734e4b1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
index 9db049395d64..fe7603621cad 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v 1.2 2012/05/21 22:52:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-173.14.34.ebuild,v 1.3 2012/05/21 23:03:14 cardoe Exp $
 
 EAPI="2"
 
@@ -24,15 +24,6 @@ RESTRICT="strip"
 EMULTILIB_PKG="true"
 
 COMMON="<x11-base/xorg-server-1.12.99
-	tools? (
-		dev-libs/atk
-		dev-libs/glib
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/pango
-	)
 	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
 	multilib? ( app-emulation/emul-linux-x86-opengl )
 	>=app-admin/eselect-opengl-1.0.9"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
index 9fc6bd4bd588..ec0570e24802 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.5 2012/05/21 22:04:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.40.ebuild,v 1.6 2012/05/21 23:03:14 cardoe Exp $
 
 EAPI="2"
 
@@ -33,7 +33,15 @@ DEPEND="${COMMON}
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
 	acpi? ( sys-power/acpid )
-	gtk? ( x11-libs/gtk+ )"
+	gtk? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango
+	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1
 	gtk? ( media-video/nvidia-settings )"
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
index 1cda4a52199a..12000231bec8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.5 2012/05/21 22:52:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.49.ebuild,v 1.6 2012/05/21 23:03:14 cardoe Exp $
 
 EAPI="2"
 
@@ -35,7 +35,15 @@ DEPEND="${COMMON}
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
 	acpi? ( sys-power/acpid )
-	tools? ( x11-libs/gtk+ )"
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango
+	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild
index d3e29e7cae0f..953006e95526 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild,v 1.2 2012/05/21 22:52:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.53.ebuild,v 1.3 2012/05/21 23:03:14 cardoe Exp $
 
 EAPI="2"
 
@@ -35,7 +35,15 @@ DEPEND="${COMMON}
 RDEPEND="${COMMON}
 	x11-libs/libXvMC
 	acpi? ( sys-power/acpid )
-	tools? ( x11-libs/gtk+ )"
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango
+	)"
 PDEPEND=">=x11-libs/libvdpau-0.3-r1"
 
 QA_TEXTRELS_x86="