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

10 files changed, 0 insertions, 856 deletions

diff --git a/x11-drivers/nvidia-legacy-drivers/Manifest b/x11-drivers/nvidia-legacy-drivers/Manifest
deleted file mode 100644
index b796b9e4..00000000
--- a/x11-drivers/nvidia-legacy-drivers/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f89501d6b1d3e44abf80af2eff20c19a22c1160ce322c25d2b5b13e212bf48fb41f94d3c1bb6f9251302e6c8facb687d807a3dc SHA512 bad3453472e8af9ef0681b82db75f9c53816a7d57ff2bf1facd2ea010e757bf7fd4fb907317471934a0cb56510eaf2a90503a3a86ec80b76afdacfa2b9ee6c13
diff --git a/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch b/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch
deleted file mode 100644
index 67172815..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/kernel-4.16.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 10fc418..22ef968 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid)
- 
- #if defined(NV_VM_INSERT_PAGE_PRESENT)
- #include <linux/pagemap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- #include <linux/dma-mapping.h>
-+#else
-+#include <linux/dma-direct.h>
-+#endif
- #endif
- 
- #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64)
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index b23dbb4..42dc576 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1906,7 +1906,12 @@ compile_test() {
-             # Determine if the phys_to_dma function is present.
-             #
-             CODE="
-+            #include <linux/version.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
-             #include <linux/dma-mapping.h>
-+#else
-+            #include <linux/dma-direct.h>
-+#endif
-             void conftest_phys_to_dma(void) {
-                 phys_to_dma();
-             }"
diff --git a/x11-drivers/nvidia-legacy-drivers/files/kernel-5.5.patch b/x11-drivers/nvidia-legacy-drivers/files/kernel-5.5.patch
deleted file mode 100644
index bda326c0..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/kernel-5.5.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff --git a/.manifest b/.manifest
-index a53265d..bc46234 100644
---- a/.manifest
-+++ b/.manifest
-@@ -36,6 +36,7 @@ kernel/nvidia/nv-rsync.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resm
- kernel/nvidia/nv-report-err.c 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
- kernel/conftest.sh 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
- kernel/common/inc/nv.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
-+kernel/common/inc/nv-drm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
- kernel/common/inc/nv-pgprot.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
- kernel/common/inc/nv-mm.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
- kernel/common/inc/nv-timer.h 0644 KERNEL_MODULE_SRC INHERIT_PATH_DEPTH:1 MODULE:resman
-diff --git a/kernel/common/inc/nv-drm.h b/kernel/common/inc/nv-drm.h
-new file mode 100644
-index 0000000..07e9f3c
---- /dev/null
-+++ b/kernel/common/inc/nv-drm.h
-@@ -0,0 +1,36 @@
-+#ifndef _NV_DRM_H_
-+#define _NV_DRM_H_
-+
-+#include "conftest.h"
-+
-+#if defined(NV_DRM_DRMP_H_PRESENT)
-+#include <drm/drmP.h>
-+#else
-+#include <linux/agp_backend.h>
-+#include <linux/file.h>
-+#include <linux/init.h>
-+#include <linux/jiffies.h>
-+#include <linux/kernel.h>
-+#include <linux/mutex.h>
-+#include <linux/slab.h>
-+#include <linux/types.h>
-+#include <asm/pgalloc.h>
-+#include <linux/uaccess.h>
-+
-+#include <uapi/drm/drm.h>
-+#include <uapi/drm/drm_mode.h>
-+
-+#include <drm/drm_agpsupport.h>
-+#include <drm/drm_crtc.h>
-+#include <drm/drm_drv.h>
-+#include <drm/drm_prime.h>
-+#include <drm/drm_pci.h>
-+#include <drm/drm_ioctl.h>
-+#include <drm/drm_sysfs.h>
-+#include <drm/drm_vblank.h>
-+#include <drm/drm_device.h>
-+
-+#include <drm/drm_gem.h>
-+#endif
-+
-+#endif
-diff --git a/kernel/conftest.sh b/kernel/conftest.sh
-index c9c2db3..dd22bb0 100755
---- a/kernel/conftest.sh
-+++ b/kernel/conftest.sh
-@@ -1150,6 +1150,9 @@ compile_test() {
-             CODE="
-             #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_drv.h>
-+            #include <drm/drm_prime.h>
-             #endif
-             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
-             #error DRM not enabled
-@@ -1781,6 +1784,8 @@ compile_test() {
-             echo "$CONFTEST_PREAMBLE
-             #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_drv.h>
-             #endif
-             #include <drm/drm_atomic.h>
-             #if !defined(CONFIG_DRM) && !defined(CONFIG_DRM_MODULE)
-@@ -1909,7 +1914,11 @@ compile_test() {
-             # attached drivers") in v3.14 (2013-12-11)
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_drv.h>
-+            #endif
-             int conftest_drm_driver_has_legacy_dev_list(void) {
-                 return offsetof(struct drm_driver, legacy_dev_list);
-             }"
-@@ -1933,7 +1942,11 @@ compile_test() {
-             #   2017-07-23  e6fc3b68558e4c6d8d160b5daf2511b99afa8814
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_crtc.h>
-+            #endif
- 
-             int conftest_drm_crtc_init_with_planes_has_name_arg(void) {
-                 return
-@@ -1949,7 +1962,11 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_CRTC_INIT_WITH_PLANES_HAS_NAME_ARG" "" "types"
- 
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_encoder.h>
-+            #endif
- 
-             int conftest_drm_encoder_init_has_name_arg(void) {
-                 return
-@@ -1964,7 +1981,11 @@ compile_test() {
-             compile_check_conftest "$CODE" "NV_DRM_ENCODER_INIT_HAS_NAME_ARG" "" "types"
- 
-             echo "$CONFTEST_PREAMBLE
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #else
-+            #include <drm/drm_plane.h>
-+            #endif
- 
-             int conftest_drm_universal_plane_init_has_format_modifiers_arg(void) {
-                 return
-@@ -1991,7 +2012,11 @@ compile_test() {
-                 echo "#undef NV_DRM_UNIVERSAL_PLANE_INIT_HAS_FORMAT_MODIFIERS_ARG" | append_conftest "types"
- 
-                 echo "$CONFTEST_PREAMBLE
-+                #if defined(NV_DRM_DRMP_H_PRESENT)
-                 #include <drm/drmP.h>
-+                #else
-+                #include <drm/drm_plane.h>
-+                #endif
- 
-                 int conftest_drm_universal_plane_init_has_name_arg(void) {
-                     return
-@@ -3084,7 +3109,9 @@ compile_test() {
-             # drm_framebuffer_{get,put}()") in v4.12 (2017-02-28).
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #endif
-             #if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
-             #include <drm/drm_framebuffer.h>
-             #endif
-@@ -3103,7 +3130,9 @@ compile_test() {
-             # drm_gem_object_{get,put}()") in v4.12 (2017-02-28).
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #endif
-             #if defined(NV_DRM_DRM_GEM_H_PRESENT)
-             #include <drm/drm_gem.h>
-             #endif
-@@ -3122,7 +3151,9 @@ compile_test() {
-             # functions") in v4.15 (2017-09-26).
-             #
-             CODE="
-+            #if defined(NV_DRM_DRMP_H_PRESENT)
-             #include <drm/drmP.h>
-+            #endif
-             #if defined(NV_DRM_DRM_DRV_H_PRESENT)
-             #include <drm/drm_drv.h>
-             #endif
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
-index 1553ebc..f851561 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.c
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
-@@ -20,6 +20,8 @@
-  * DEALINGS IN THE SOFTWARE.
-  */
- 
-+#include <linux/version.h>
-+
- #include "nvidia-drm-conftest.h" /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -71,7 +73,11 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-     struct nv_drm_encoder *nv_detected_encoder = NULL;
- 
-     struct NvKmsKapiDynamicDisplayParams *pDetectParams = NULL;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-     unsigned int i;
-+#else
-+    struct drm_encoder *encoder = NULL;
-+#endif
- 
-     BUG_ON(!mutex_is_locked(&dev->mode_config.mutex));
- 
-@@ -87,11 +93,16 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-         goto done;
-     }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-     for (i = 0;
-          i < DRM_CONNECTOR_MAX_ENCODER && detected_encoder == NULL; i++) {
-         struct drm_encoder *encoder;
-+#else
-+    drm_connector_for_each_possible_encoder(connector, encoder) {
-+#endif
-         struct nv_drm_encoder *nv_encoder;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
-         if (connector->encoder_ids[i] == 0) {
-             break;
-         }
-@@ -102,6 +113,7 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-             BUG_ON(encoder != NULL);
-             continue;
-         }
-+#endif
- 
-         /*
-          * DVI-I connectors can drive both digital and analog
-@@ -169,6 +181,8 @@ static enum drm_connector_status __nv_drm_connector_detect_internal(
-             }
- 
-             detected_encoder = encoder;
-+
-+            break;
-         }
-     }
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-connector.h b/kernel/nvidia-drm/nvidia-drm-connector.h
-index f74e22c..099390d 100644
---- a/kernel/nvidia-drm/nvidia-drm-connector.h
-+++ b/kernel/nvidia-drm/nvidia-drm-connector.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- #include "nvtypes.h"
- #include "nvkms-api-types.h"
-diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.h b/kernel/nvidia-drm/nvidia-drm-crtc.h
-index 31ef3b5..5de3a51 100644
---- a/kernel/nvidia-drm/nvidia-drm-crtc.h
-+++ b/kernel/nvidia-drm/nvidia-drm-crtc.h
-@@ -29,7 +29,7 @@
- 
- #include "nvidia-drm-helper.h"
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvtypes.h"
- #include "nvkms-kapi.h"
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index a66d3cc..06bf859 100644
---- a/kernel/nvidia-drm/nvidia-drm-drv.c
-+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
-@@ -39,7 +39,7 @@
- 
- #include "nvidia-drm-ioctl.h"
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- /*
-  * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
-diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.h b/kernel/nvidia-drm/nvidia-drm-encoder.h
-index bbaf986..af341a8 100644
---- a/kernel/nvidia-drm/nvidia-drm-encoder.h
-+++ b/kernel/nvidia-drm/nvidia-drm-encoder.h
-@@ -32,7 +32,7 @@
- #if defined(NV_DRM_DRM_ENCODER_H_PRESENT)
- #include <drm/drm_encoder.h>
- #else
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #endif
- 
- #include "nvkms-kapi.h"
-diff --git a/kernel/nvidia-drm/nvidia-drm-fb.h b/kernel/nvidia-drm/nvidia-drm-fb.h
-index 7f292ce..d13bc4c 100644
---- a/kernel/nvidia-drm/nvidia-drm-fb.h
-+++ b/kernel/nvidia-drm/nvidia-drm-fb.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvidia-drm-gem-nvkms-memory.h"
- #include "nvkms-kapi.h"
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h
-index b621969..326f810 100644
---- a/kernel/nvidia-drm/nvidia-drm-gem.h
-+++ b/kernel/nvidia-drm/nvidia-drm-gem.h
-@@ -29,7 +29,7 @@
- 
- #include "nvidia-drm-priv.h"
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvkms-kapi.h"
- 
- #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c
-index da602ac..e5d6daa 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.c
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.c
-@@ -31,7 +31,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #if defined(NV_DRM_DRM_ATOMIC_UAPI_H_PRESENT)
- #include <drm/drm_atomic_uapi.h>
- #endif
-diff --git a/kernel/nvidia-drm/nvidia-drm-helper.h b/kernel/nvidia-drm/nvidia-drm-helper.h
-index 8f050d8..71c4b90 100644
---- a/kernel/nvidia-drm/nvidia-drm-helper.h
-+++ b/kernel/nvidia-drm/nvidia-drm-helper.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- /*
-  * drm_dev_put() is added by commit 9a96f55034e41b4e002b767e9218d55f03bdff7d
-diff --git a/kernel/nvidia-drm/nvidia-drm-modeset.h b/kernel/nvidia-drm/nvidia-drm-modeset.h
-index 06659c5..e9d7b70 100644
---- a/kernel/nvidia-drm/nvidia-drm-modeset.h
-+++ b/kernel/nvidia-drm/nvidia-drm-modeset.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- struct drm_atomic_state *nv_drm_atomic_state_alloc(struct drm_device *dev);
- void nv_drm_atomic_state_clear(struct drm_atomic_state *state);
-diff --git a/kernel/nvidia-drm/nvidia-drm-os-interface.h b/kernel/nvidia-drm/nvidia-drm-os-interface.h
-index f43f851..7f4ff8b 100644
---- a/kernel/nvidia-drm/nvidia-drm-os-interface.h
-+++ b/kernel/nvidia-drm/nvidia-drm-os-interface.h
-@@ -29,7 +29,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- /* Set to true when the atomic modeset feature is enabled. */
- extern bool nv_drm_modeset_module_param;
-diff --git a/kernel/nvidia-drm/nvidia-drm-prime-fence.h b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-index 20da923..f3cc2b4 100644
---- a/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-+++ b/kernel/nvidia-drm/nvidia-drm-prime-fence.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ)
- 
-diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h
-index 9076835..77a95f3 100644
---- a/kernel/nvidia-drm/nvidia-drm-priv.h
-+++ b/kernel/nvidia-drm/nvidia-drm-priv.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- 
- #if defined(NV_DRM_DRM_GEM_H_PRESENT)
- #include <drm/drm_gem.h>
-diff --git a/kernel/nvidia-drm/nvidia-drm-utils.h b/kernel/nvidia-drm/nvidia-drm-utils.h
-index 6d24120..95190c4 100644
---- a/kernel/nvidia-drm/nvidia-drm-utils.h
-+++ b/kernel/nvidia-drm/nvidia-drm-utils.h
-@@ -27,7 +27,7 @@
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
- 
--#include <drm/drmP.h>
-+#include "nv-drm.h"
- #include "nvkms-kapi.h"
- 
- struct NvKmsKapiConnectorInfo*
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf b/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf
deleted file mode 100644
index 9c36f59b..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-drm-outputclass.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Section "OutputClass"
-    Identifier "nvidia"
-    MatchDriver "nvidia-drm"
-    Driver "nvidia"
-    Option "AllowEmptyInitialConfiguration"
-    ModulePath "/usr/lib/nvidia/xorg"
-    ModulePath "/usr/lib/xorg/modules"
-EndSection
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch b/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch
deleted file mode 100644
index 3ba17a8c..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-legacy-drivers-390.132-conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2018-03-22 05:39:53.000000000 +0000
-+++ b/kernel/dkms.conf	2018-04-09 16:18:23.177125417 +0100
-@@ -1,12 +1,20 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-legacy-drivers-dkms"
-+PACKAGE_VERSION="390.132"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
- # the 'make' command name to suppress this behavior.
--MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules"
- 
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf b/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf
deleted file mode 100644
index 637ac1af..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# run-time configuration file for /etc/init.d/nvidia-persistenced
-
-# NVPD_USER: The user nvidia-persistenced is intended to run for
-NVPD_USER=""
-
-# ARGS: Additional arguments to set the default persistence mode
-# (see nvidia-persistenced(1))
-ARGS=""
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init b/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init
deleted file mode 100644
index f80456d1..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-persistenced.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/var/run/nvidia-persistenced/nvidia-persistenced.pid"
-
-start() {
-	if ! [ "${NVPD_USER}x" = x ]; then
-		ebegin "Starting nvidia-persistenced for ${NVPD_USER}"
-		NVPD_USER_ARG="--user ${NVPD_USER}"
-	else
-		ebegin "Starting nvidia-persistenced"
-	fi
-	start-stop-daemon --start --quiet --pidfile ${pidfile} \
-		--background --exec /opt/bin/nvidia-persistenced \
-		-- ${NVPD_USER_ARG} ${ARGS}
-	eend $?	
-}
-
-stop() {
-	ebegin "Stopping nvidia-persistenced"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	eend $?
-}
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init b/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init
deleted file mode 100644
index 8ee51e34..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia-smi.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/nvidia-smi.pid"
-
-depend() {
-    after modules
-}
-
-start() {
-	ebegin "Starting NVIDIA System Management Interface"
-	rm -f ${pidfile}
-	start-stop-daemon --start --quiet --pidfile ${pidfile} \
-		--make-pidfile --background --exec /opt/bin/nvidia-smi -- \
-		-q -l 300
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NVIDIA System Management Interface"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	eend $?
-}
diff --git a/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf b/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf
deleted file mode 100644
index 00c6f588..00000000
--- a/x11-drivers/nvidia-legacy-drivers/files/nvidia.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-blacklist nouveau
-options nouveau modeset=0
-alias nouveau off
diff --git a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132-r2.ebuild b/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132-r2.ebuild
deleted file mode 100644
index 9df85f03..00000000
--- a/x11-drivers/nvidia-legacy-drivers/nvidia-legacy-drivers-390.132-r2.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib-minimal portability toolchain-funcs unpacker
-
-NV_URI="http://http.download.nvidia.com/XFree86/"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror"
-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? (
-				media-libs/libglvnd[${MULTILIB_USEDEP}]
-				!app-eselect/eselect-opengl
-		)
-		app-misc/pax-utils
-	)"
-DEPEND="${COMMON}"
-PDEPEND="
-	tools? ( ~x11-misc/nvidia-legacy-settings-${PV}:${SLOT} )"
-RDEPEND="
-	${COMMON}
-	!!x11-drivers/nvidia-drivers
-	acpi? ( sys-power/acpid )
-	dkms? ( ~sys-kernel/${PN}-dkms-${PV}:${SLOT} )
-	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
-	X? (
-		<x11-base/xorg-server-1.20.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-PATCHES=( 
-	"${FILESDIR}"/kernel-4.16.patch
-	"${FILESDIR}"/kernel-5.5.patch
-	"${FILESDIR}"/"${P}"-conf.patch
-)
-
-S=${WORKDIR}/
-
-pkg_setup() {
-	export DISTCC_DISABLE=1
-	export CCACHE_DISABLE=1
-
-	NV_DOC="${S}"
-	NV_OBJ="${S}"
-	NV_SRC="${S}/kernel"
-	NV_MAN="${S}"
-	NV_X11="${S}"
-	NV_SOVER=${PV}
-}
-
-src_prepare() {
-	default
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	if ! [ -f nvidia_icd.json ]; then
-		cp nvidia_icd.json.template nvidia_icd.json || die
-		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
-}
-
-src_install() {
-	# Xorg DDX && GLX, GLVND, Vulkan ICD
-	if use X; then
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/nvidia/xorg
-
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins "${FILESDIR}"/nvidia-drm-outputclass.conf 50-nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins ${NV_X11}/10_nvidia.json
-
-		insinto /etc/vulkan/icd.d
-		doins ${NV_X11}/nvidia_icd.json
-	fi
-
-	# Wayland
-	if use wayland; then
-		insinto /usr/share/egl/egl_external_platform.d
-		doins ${NV_X11}/10_nvidia_wayland.json
-	fi
-
-	insinto /lib/modprobe.d
-	doins "${FILESDIR}"/nvidia.conf
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-	donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-
-	# OpenCL ICD for NVIDIA
-	insinto /etc/OpenCL/vendors
-	doins ${NV_OBJ}/nvidia.icd
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe ${NV_OBJ}/nvidia-xconfig
-	fi
-
-	doexe ${NV_OBJ}/nvidia-cuda-mps-control
-	doexe ${NV_OBJ}/nvidia-cuda-mps-server
-	doexe ${NV_OBJ}/nvidia-debugdump
-	doexe ${NV_OBJ}/nvidia-persistenced
-	doexe ${NV_OBJ}/nvidia-smi
-
-	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
-	doexe ${NV_OBJ}/nvidia-modprobe
-	fowners root:video /opt/bin/nvidia-modprobe
-	fperms 4710 /opt/bin/nvidia-modprobe
-	dosym /{opt,usr}/bin/nvidia-modprobe
-
-	# init
-	newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
-	newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
-
-	# manpages
-	if use X ; then
-		doman "${NV_MAN}"/nvidia-xconfig.1
-	fi
-
-	doman "${NV_MAN}"/nvidia-smi.1
-	doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-	doman "${NV_MAN}"/nvidia-modprobe.1
-	doman "${NV_MAN}"/nvidia-persistenced.1
-
-	if has_multilib_profile && use multilib; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || die "failed to iterate through all ABIs"
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	if use libglvnd; then
-		local GL_ROOT="/usr/$(get_libdir)"
-	else
-		local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-	fi
-	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-	local nv_libdir="${NV_OBJ}"
-
-	if  has_multilib_profile && [[ ${ABI} == "x86" ]]; then
-		nv_libdir="${NV_OBJ}"/32
-	fi
-
-	if use X; then
-		NV_GLX_LIBRARIES=(
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-			"libnvidia-ml.so.${NV_SOVER}"
-			"tls/libnvidia-tls.so.${NV_SOVER}"
-		)
-
-		if ! use libglvnd; then
-			NV_GLX_LIBRARIES+=(
-				"libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
-				"libGL.so.1.7.0 ${GL_ROOT}"
-				"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-				"libGLESv2.so.2.1.0 ${GL_ROOT}"
-				"libGLX.so.0 ${GL_ROOT}"
-				"libGLdispatch.so.0 ${GL_ROOT}"
-				"libOpenGL.so.0 ${GL_ROOT}"
-			)
-		fi
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.2"
-			)
-		fi
-
-		if has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${nv_libdir}"/${NV_LIB}
-		done
-	fi
-}
-
-_dracut_initramfs_regen() {
-	if [ -x $(which dracut) ]; then
-		dracut -N -f --no-hostonly-cmdline
-	fi
-}
-
-pkg_preinst() {
-	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-	fi
-
-	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-		rm -f "${ROOT}"/etc/env.d/09nvidia
-	fi
-}
-
-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"
-		elog "installed. Additionally, once the driver is loaded your card"
-		elog "and fan will run at max speed which may not be desirable."
-		elog "Use the 'nvidia-smi' init script to have your card and fan"
-		elog "speed scale appropriately."
-		elog
-	fi
-	if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then
-		_dracut_initramfs_regen
-	fi
-}
-
-pkg_prerm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-}
-
-pkg_postrm() {
-	if ! use libglvnd; then
-		use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-	fi
-	if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then
-		_dracut_initramfs_regen
-	fi
-}