Move eselect-opengl into DEPEND only, so it can be uninstalled later.

(Portage version: 2.1.3_rc9)

9 files changed, 36 insertions, 29 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 48e29d414187..1ac25ea2ae9e 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.59 2007/07/28 03:57:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.60 2007/07/30 07:51:23 dberkholz Exp $
+
+  30 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.8776-r1.ebuild,
+  nvidia-drivers-1.0.9631-r1.ebuild, nvidia-drivers-1.0.9639.ebuild,
+  nvidia-drivers-1.0.9746-r1.ebuild, nvidia-drivers-1.0.9755-r1.ebuild,
+  nvidia-drivers-100.14.09.ebuild, nvidia-drivers-100.14.11.ebuild:
+  Move eselect-opengl into DEPEND only, so it can be uninstalled later.
 
   28 Jul 2007; Steve Dibb <beandog@gentoo.org>
   nvidia-drivers-1.0.7185.ebuild, nvidia-drivers-1.0.9639.ebuild,
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.7185.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.7185.ebuild
index e3b1d06e958d..1d816aca3516 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.7185.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.7185.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.7185.ebuild,v 1.5 2007/07/28 03:57:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.7185.ebuild,v 1.6 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -28,11 +28,11 @@ COMMON="x11-base/xorg-server
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
-	media-libs/mesa
-	app-admin/eselect-opengl"
+	media-libs/mesa"
 PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776-r1.ebuild
index dded278c51f3..4a8acef5c010 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776-r1.ebuild,v 1.6 2007/07/05 22:29:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8776-r1.ebuild,v 1.7 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod
 
@@ -22,11 +22,11 @@ IUSE=""
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-DEPEND="kernel_linux? ( virtual/linux-sources )"
+DEPEND="kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="kernel_linux? ( virtual/modutils )
 	x11-base/xorg-server
 	media-libs/mesa
-	app-admin/eselect-opengl
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631-r1.ebuild
index 7726f9732935..09de148f241f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631-r1.ebuild,v 1.5 2007/07/05 22:29:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9631-r1.ebuild,v 1.6 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic
 
@@ -22,11 +22,11 @@ IUSE=""
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-DEPEND="kernel_linux? ( virtual/linux-sources )"
+DEPEND="kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="kernel_linux? ( virtual/modutils )
 	x11-base/xorg-server
 	media-libs/mesa
-	app-admin/eselect-opengl
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild
index c96a10c77fe8..58fdb7271806 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild,v 1.4 2007/07/28 03:57:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild,v 1.5 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -28,11 +28,11 @@ COMMON="x11-base/xorg-server
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
-	media-libs/mesa
-	app-admin/eselect-opengl"
+	media-libs/mesa"
 PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746-r1.ebuild
index 8727d3c7501e..d6e869910660 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746-r1.ebuild,v 1.4 2007/07/05 22:29:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9746-r1.ebuild,v 1.5 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic
 
@@ -22,11 +22,11 @@ IUSE=""
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-DEPEND="kernel_linux? ( virtual/linux-sources )"
+DEPEND="kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="kernel_linux? ( virtual/modutils )
 	x11-base/xorg-server
 	media-libs/mesa
-	app-admin/eselect-opengl
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9755-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9755-r1.ebuild
index 98958e96c1e3..15863815c925 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9755-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9755-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9755-r1.ebuild,v 1.3 2007/07/05 22:29:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9755-r1.ebuild,v 1.4 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic
 
@@ -22,11 +22,11 @@ IUSE=""
 RESTRICT="strip"
 EMULTILIB_PKG="true"
 
-DEPEND="kernel_linux? ( virtual/linux-sources )"
+DEPEND="kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="kernel_linux? ( virtual/modutils )
 	x11-base/xorg-server
 	media-libs/mesa
-	app-admin/eselect-opengl
 	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild
index 1747d92b0365..3b10fce73f25 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild,v 1.7 2007/07/28 03:57:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild,v 1.8 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -28,11 +28,11 @@ COMMON="x11-base/xorg-server
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
-	media-libs/mesa
-	app-admin/eselect-opengl"
+	media-libs/mesa"
 PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
index a2b5a9bfca5f..ca75f599121d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.8 2007/07/18 22:53:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.9 2007/07/30 07:51:23 dberkholz Exp $
 
 inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
 
@@ -28,11 +28,11 @@ COMMON="x11-base/xorg-server
 	!app-emulation/emul-linux-x86-nvidia
 	!x11-drivers/nvidia-legacy-drivers"
 DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )"
+	kernel_linux? ( virtual/linux-sources )
+	app-admin/eselect-opengl"
 RDEPEND="${COMMON}
 	kernel_linux? ( virtual/modutils )
-	media-libs/mesa
-	app-admin/eselect-opengl"
+	media-libs/mesa"
 PDEPEND="gtk? ( media-video/nvidia-settings )"
 
 QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}