x11-drivers/nvidia-drivers: Drop obsolete negative dependencies

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

5 files changed, 0 insertions, 69 deletions

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
index a851136b1f81..0aa995c49b6b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r4.ebuild
@@ -70,7 +70,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
index 18d9f7ed2272..1cf485cc4a82 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r6.ebuild
@@ -50,10 +50,8 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
 			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
 	)
@@ -65,7 +63,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
@@ -541,11 +538,6 @@ pkg_preinst() {
 pkg_postinst() {
 	use driver && use kernel_linux && linux-mod_pkg_postinst
 
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
 	readme.gentoo_print_elog
 
 	if ! use X; then
@@ -575,15 +567,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 pkg_postrm() {
 	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
index 812530139112..d4cb4d9d301e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r2.ebuild
@@ -50,10 +50,8 @@ COMMON="
 		x11-libs/pango[X]
 	)
 	X? (
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
 			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
-			!app-eselect/eselect-opengl
 		)
 		app-misc/pax-utils
 	)
@@ -65,7 +63,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
@@ -544,11 +541,6 @@ pkg_preinst() {
 pkg_postinst() {
 	use driver && use kernel_linux && linux-mod_pkg_postinst
 
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
 	readme.gentoo_print_elog
 
 	if ! use X; then
@@ -578,15 +570,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 pkg_postrm() {
 	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
index 7087b353a799..ad31e621da66 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild
@@ -52,9 +52,7 @@ COMMON="
 	X? (
 		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
 		app-misc/pax-utils
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			!app-eselect/eselect-opengl
 			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
 	)
@@ -66,7 +64,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
@@ -547,11 +544,6 @@ pkg_preinst() {
 pkg_postinst() {
 	use driver && use kernel_linux && linux-mod_pkg_postinst
 
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
 	readme.gentoo_print_elog
 
 	if ! use X; then
@@ -581,15 +573,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 pkg_postrm() {
 	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
 }
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild
index fb7867618a30..90304645c0e0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-455.28.ebuild
@@ -52,9 +52,7 @@ COMMON="
 	X? (
 		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
 		app-misc/pax-utils
-		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
-			!app-eselect/eselect-opengl
 			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
 		)
 	)
@@ -66,7 +64,6 @@ DEPEND="
 "
 RDEPEND="
 	${COMMON}
-	tools? ( !media-video/nvidia-settings )
 	uvm? ( >=virtual/opencl-3 )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
@@ -547,11 +544,6 @@ pkg_preinst() {
 pkg_postinst() {
 	use driver && use kernel_linux && linux-mod_pkg_postinst
 
-	# Switch to the nvidia implementation
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	fi
-
 	readme.gentoo_print_elog
 
 	if ! use X; then
@@ -581,15 +573,6 @@ pkg_postinst() {
 	elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
 }
 
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
 pkg_postrm() {
 	use driver && use kernel_linux && linux-mod_pkg_postrm
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
 }