move : x11-drivers/nvidia-legacy-drivers -> x11-drivers/nvidia-drivers-legacy, fix eselect-opencl (now deprecated) conflict

20 files changed, 4 insertions, 6 deletions

diff --git a/sys-kernel/nvidia-legacy-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-legacy-dkms/Manifest
index b796b9e4..b796b9e4 100644
--- a/sys-kernel/nvidia-legacy-drivers-dkms/Manifest
+++ b/sys-kernel/nvidia-drivers-legacy-dkms/Manifest
diff --git a/sys-kernel/nvidia-legacy-drivers-dkms/files/kernel-4.16.patch b/sys-kernel/nvidia-drivers-legacy-dkms/files/kernel-4.16.patch
index 67172815..67172815 100644
--- a/sys-kernel/nvidia-legacy-drivers-dkms/files/kernel-4.16.patch
+++ b/sys-kernel/nvidia-drivers-legacy-dkms/files/kernel-4.16.patch
diff --git a/sys-kernel/nvidia-legacy-drivers-dkms/files/kernel-5.5.patch b/sys-kernel/nvidia-drivers-legacy-dkms/files/kernel-5.5.patch
index bda326c0..bda326c0 100644
--- a/sys-kernel/nvidia-legacy-drivers-dkms/files/kernel-5.5.patch
+++ b/sys-kernel/nvidia-drivers-legacy-dkms/files/kernel-5.5.patch
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch b/sys-kernel/nvidia-drivers-legacy-dkms/files/nvidia-drivers-legacy-dkms-390.132-conf.patch
index 3ba17a8c..98bdd0bd 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch
+++ b/sys-kernel/nvidia-drivers-legacy-dkms/files/nvidia-drivers-legacy-dkms-390.132-conf.patch
@@ -4,7 +4,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 @@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-legacy-drivers-dkms"
++PACKAGE_NAME="nvidia-drivers-legacy-dkms"
 +PACKAGE_VERSION="390.132"
  AUTOINSTALL="yes"
  
diff --git a/sys-kernel/nvidia-legacy-drivers-dkms/nvidia-legacy-drivers-dkms-390.132-r2.ebuild b/sys-kernel/nvidia-drivers-legacy-dkms/nvidia-drivers-legacy-dkms-390.132-r3.ebuild
index e6226cf8..e6226cf8 100644
--- a/sys-kernel/nvidia-legacy-drivers-dkms/nvidia-legacy-drivers-dkms-390.132-r2.ebuild
+++ b/sys-kernel/nvidia-drivers-legacy-dkms/nvidia-drivers-legacy-dkms-390.132-r3.ebuild
diff --git a/x11-drivers/nvidia-legacy-drivers/Manifest b/x11-drivers/nvidia-drivers-legacy/Manifest
index b796b9e4..b796b9e4 100644
--- a/x11-drivers/nvidia-legacy-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers-legacy/Manifest
diff --git a/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch b/x11-drivers/nvidia-drivers-legacy/files/kernel-4.16.patch
index 67172815..67172815 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch
+++ b/x11-drivers/nvidia-drivers-legacy/files/kernel-4.16.patch
diff --git a/x11-drivers/nvidia-legacy-drivers/files/kernel-5.5.patch b/x11-drivers/nvidia-drivers-legacy/files/kernel-5.5.patch
index bda326c0..bda326c0 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/kernel-5.5.patch
+++ b/x11-drivers/nvidia-drivers-legacy/files/kernel-5.5.patch
diff --git a/sys-kernel/nvidia-legacy-drivers-dkms/files/nvidia-legacy-drivers-dkms-390.132-conf.patch b/x11-drivers/nvidia-drivers-legacy/files/nvidia-drivers-legacy-390.132-conf.patch
index 3ba17a8c..98bdd0bd 100644
--- a/sys-kernel/nvidia-legacy-drivers-dkms/files/nvidia-legacy-drivers-dkms-390.132-conf.patch
+++ b/x11-drivers/nvidia-drivers-legacy/files/nvidia-drivers-legacy-390.132-conf.patch
@@ -4,7 +4,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 @@ -1,12 +1,20 @@
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-legacy-drivers-dkms"
++PACKAGE_NAME="nvidia-drivers-legacy-dkms"
 +PACKAGE_VERSION="390.132"
  AUTOINSTALL="yes"
  
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf
index 9c36f59b..9c36f59b 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf
+++ b/x11-drivers/nvidia-drivers-legacy/files/nvidia-drm-outputclass.conf
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf
index 637ac1af..637ac1af 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf
+++ b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.conf
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init
index f80456d1..f80456d1 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init
+++ b/x11-drivers/nvidia-drivers-legacy/files/nvidia-persistenced.init
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init b/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init
index 8ee51e34..8ee51e34 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init
+++ b/x11-drivers/nvidia-drivers-legacy/files/nvidia-smi.init
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf b/x11-drivers/nvidia-drivers-legacy/files/nvidia.conf
index 00c6f588..00c6f588 100644
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf
+++ b/x11-drivers/nvidia-drivers-legacy/files/nvidia.conf
diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.132-r3.ebuild
index 9df85f03..c9378785 100644
--- a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132-r2.ebuild
+++ b/x11-drivers/nvidia-drivers-legacy/nvidia-drivers-legacy-390.132-r3.ebuild
@@ -20,7 +20,6 @@ EMULTILIB_PKG="true"
 IUSE="acpi compat +dkms libglvnd multilib +tools wayland +X"
 
 COMMON="
-	app-eselect/eselect-opencl
 	X? (
 		!libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
 		libglvnd? (
@@ -31,7 +30,7 @@ COMMON="
 	)"
 DEPEND="${COMMON}"
 PDEPEND="
-	tools? ( ~x11-misc/nvidia-legacy-settings-${PV}:${SLOT} )"
+	tools? ( ~x11-misc/nvidia-settings-legacy-${PV}:${SLOT} )"
 RDEPEND="
 	${COMMON}
 	!!x11-drivers/nvidia-drivers
@@ -301,7 +300,6 @@ pkg_postinst() {
 	if ! use libglvnd; then
 		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
 	fi
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
 	if ! use X; then
 		elog "You have selected to not install the X.org driver. Along with"
 		elog "this the OpenGL libraries and VDPAU libraries were not"
diff --git a/x11-misc/nvidia-legacy-settings/Manifest b/x11-misc/nvidia-settings-legacy/Manifest
index c41d5ee0..c41d5ee0 100644
--- a/x11-misc/nvidia-legacy-settings/Manifest
+++ b/x11-misc/nvidia-settings-legacy/Manifest
diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch
index be03fa27..be03fa27 100644
--- a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-fno-common.patch
+++ b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-fno-common.patch
diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
index de65a598..de65a598 100644
--- a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings-linker.patch
+++ b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy-linker.patch
diff --git a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop
index 35f8aeee..35f8aeee 100644
--- a/x11-misc/nvidia-legacy-settings/files/nvidia-legacy-settings.desktop
+++ b/x11-misc/nvidia-settings-legacy/files/nvidia-settings-legacy.desktop
diff --git a/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild b/x11-misc/nvidia-settings-legacy/nvidia-settings-legacy-390.132-r3.ebuild
index e5c660a1..12dac677 100644
--- a/x11-misc/nvidia-legacy-settings/nvidia-legacy-settings-390.132-r2.ebuild
+++ b/x11-misc/nvidia-settings-legacy/nvidia-settings-legacy-390.132-r3.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 
 RDEPEND="${COMMON_DEPEND}
 	!!x11-misc/nvidia-settings
-	~x11-drivers/nvidia-legacy-drivers-${PV}:${SLOT}"
+	~x11-drivers/nvidia-drivers-legacy-${PV}:${SLOT}"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"