[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[Jeroen Roovers]

commit:     edfa9d11c5ff0592de39b960e5cfa9c445014e31
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 04:21:21 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 04:22:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfa9d11

x11-drivers/nvidia-drivers: Old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-drivers/nvidia-drivers/Manifest                |   3 -
 .../nvidia-drivers/nvidia-drivers-430.64-r4.ebuild | 564 --------------------
 .../nvidia-drivers/nvidia-drivers-435.21-r4.ebuild | 582 --------------------
 .../nvidia-drivers/nvidia-drivers-440.100.ebuild   | 585 --------------------
 .../nvidia-drivers/nvidia-drivers-440.82-r3.ebuild | 588 ---------------------
 .../nvidia-drivers/nvidia-drivers-440.82-r4.ebuild | 588 ---------------------
 .../nvidia-drivers/nvidia-drivers-450.51.ebuild    | 586 --------------------
 7 files changed, 3496 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index 846b306da5e..f7e1ccd8048 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,7 +7,6 @@ DIST NVIDIA-FreeBSD-x86_64-390.138.tar.gz 65280213 BLAKE2B 
36d5651ceaf90cefcf9e8
 DIST NVIDIA-FreeBSD-x86_64-430.64.tar.gz 62723909 BLAKE2B 
f3e48bc38a3ec051a75c08845b45c0ba6b80bca31d7efd85f115e6244f9cdff70c68466f9139f69c645207d4cf61103432d75c943d3f3508811d405fba55d1b6
 SHA512 
498a3007c065d8b17f94024f6ca80ffbe3dca253fdb73c4a08babede821e52f8466523b402af350e961f153c5f732eb04160937fabef1f1be3846a0a4743b310
 DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B 
fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1
 SHA512 
2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-FreeBSD-x86_64-440.100.tar.gz 82523267 BLAKE2B 
9d8eddcf3a58787a03fab207c197d722ff047f8bc840ea41e8d38815fbfab9e54759b9fbeaa26e3d147f54cb4a510eec421708d3bbb21197922f4dc175ed6df5
 SHA512 
96f57e1f308f0e5f00ef09a128e91a68ac55033893000e84cf4ff1a910a88798743c911b3effcc26c3f27ae224b733d8c2f87e9ec0596149f65ad7bcd71edbc5
-DIST NVIDIA-FreeBSD-x86_64-440.82.tar.gz 82289126 BLAKE2B 
b8d0a0c235bbc7a1bdeb6cde2a3c72b4b54044e6d22cdf9c275640349051f9c1aa1ce358f47b10b0917d15f359ccec579f43caf8e4ec7a142192061b9e61a7b7
 SHA512 
88c7ce2f3786a364befd5690e973eb82b12421d0abbd16cf88e0727a137ce0099fe606b577d325185f3ee85bace89da745cae000d8d8665548a283b5bb397095
 DIST NVIDIA-FreeBSD-x86_64-450.51.tar.gz 82784766 BLAKE2B 
fbd0e71919b16db5957539c5b44a9d974e01d6ab42d5c292aaa4a4e06125d982e37607e28124ae63436eb1d3fcb1b7eb9e1e258b1644310d00d4eebf9fe17ae7
 SHA512 
0cba373609787e2cb341232a619b3d95bc6c4da8db27633f717ba5654e7717005089d6c2ef4801ff117e6f35f8fa522b600864cf440578cad9397b7f839e16fe
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.132.run 29084574 BLAKE2B 
4727627de610928f0808c0213c9d359c5566900972ab9fbd3d0c58b36c0a1331799ceea22b4defdcfb81c3132f6124d8a6357de8124921eef608938afdc1380d
 SHA512 
2f78a722ec31ceda86afc1831cb42d0eab8f8698b94c7fbc8569a6d34693b50e74453d5aaf3c0180f1fc2511b8c237ac635aceb24bcbea468f2a092cb44f98ee
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 
342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830
 SHA512 
e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
@@ -20,7 +19,6 @@ DIST NVIDIA-Linux-x86_64-390.138.run 83780873 BLAKE2B 
5e6a9d77dd2b9de17d92319810
 DIST NVIDIA-Linux-x86_64-430.64.run 111331457 BLAKE2B 
59d8b739bc472810eb896ef620735b6f21ccfde653e08f248797720d21d75580dcea2448f17a5d1c32be393595d9dfedc48c81e96a8ea422c7f0d9eadf36ae1c
 SHA512 
552bf1e8c4725258c07cbb0e000d0e407fba1b51207903f2b77c0d9fd8b15b629f791b20239f75a1aec85aa03cbcca90a1cb633090919cf0599054231f715250
 DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B 
e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c
 SHA512 
e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST NVIDIA-Linux-x86_64-440.100.run 144653408 BLAKE2B 
a62e6324f5ac6033c1c4b59486c86a6d4f81b240e5a7ddf9f861f9cfec4daedbe08ef3af6556c1cd4260a5a6fcd1b8bfed886ae617677d87c3a900d0e313267b
 SHA512 
274b3a8e4c801b67a3f71f11da93134bc1a16a48bc85a6bf63265c00bb3fd8caf935dd23c85c40285a162e83c146bd5e34bb0b1d74fc34e7122bfc4c3a8c81e7
-DIST NVIDIA-Linux-x86_64-440.82.run 142872609 BLAKE2B 
3ebef17002a788f145b61fb8c921f120324eac036ff4c7b972913e30ed830339fc971fd352f5e59ee3bb1b4a7a159dcf3e35d2f33ee37357c3f177aa605307ea
 SHA512 
d86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3
 DIST NVIDIA-Linux-x86_64-450.51.run 140812490 BLAKE2B 
927820fb30e0aac7d022acc82c969503e63be66045d7f10eee0af02b065251ecc4a0c95caef30cf0c2bb2e94de02f59b4469b26eaa801e67d6340184139b82ed
 SHA512 
ddb63f28ddbfa9e5c1bacbd3a5e8d529072c98b09a54c745467ed3ce87e8d5ffef80e41848bb473104147554dbac7dd1d1283821ceef6de05d3a2f8538e2ca33
 DIST nvidia-settings-340.108.tar.bz2 1550018 BLAKE2B 
1acdfbcb0e7c02af33f5e86b9b140e356057efd9825fbc130971884ae76dd23765c2a0dbd00e1ac47bbff882f6d004e0a10c0195e6c6dce1408c72a00e0e6322
 SHA512 
d8b6dcbd3803af4da22cfffc039e1c050313f90b7ee86106a784863f7c203de9137ac2fee12aa800498cc56081dbe7e3aaa943c162037477ce97a07a237db41a
 DIST nvidia-settings-390.132.tar.bz2 1109373 BLAKE2B 
cec60b7409f6d352afe3845a2ec65db96183d1fe009340fa3601166718f21b43bb08b63c5eaaaf4c266c7b16e7d374f6ecc00691763d5ae1b6902c8002da5bea
 SHA512 
12553edc1a1ba9c3f578e0e921b25ec7114cbc80a55621cbd612a1bd85c9a518e221b30809058e4df5da6ae75ea7a1cd5c3d9c8f02a0898bc8c08ac9c22ccee3
@@ -28,5 +26,4 @@ DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 
4171c12de0a6fb97b655567d4cc
 DIST nvidia-settings-430.64.tar.bz2 1130931 BLAKE2B 
032bbe8cdb7ec3b353e8f8ef33d0e86f4b4f3ef24b38de669e09173519149efe0aa55d5d30d0a0c6d2b8398d5ce38bbe4176df735501725475df4137d533e57d
 SHA512 
fa82699610aa0f4709101e1a4e9e8147b133c85afb20ecb4506bfccf233e4f42dac26e53e2966f2137eb29190b5e4173b267167f5341b516fa1169785946e240
 DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 
855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24
 SHA512 
8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
 DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B 
bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b
 SHA512 
4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
-DIST nvidia-settings-440.82.tar.bz2 1128498 BLAKE2B 
cc26d83b8ac8d609919db15b462b98976ad063026c39fdf58de36ce26a5b9a9ed5aca8e966f5b61c231ab1f7324a5530fb9779fccb999f39f79252570d62cb79
 SHA512 
8f9b546f65a1bd17f6336df9e62b0d1403581d3f60276793a536ff39bf67038def1c2738545b24b04eb465860f0cb97b5b9688d7dfb759fda567c05b1cc651ff
 DIST nvidia-settings-450.51.tar.bz2 1056993 BLAKE2B 
a410593a3217023103c2c783c7a2ca0dee1c6a2af8dec1f0398159aa8192b307e4d27690b9987e879e863e7667b2d046f6128ca1634750863b58d4727b4d2a12
 SHA512 
6fd455c1910a3ff6105facc06ef65e29f88a0133794f27bf36b999cd513f5639a2c24c53bd5bca308730e6c66f10eda25d191bb815eee53d39b5632a1ce466e1

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
deleted file mode 100644
index 487a8e632b5..00000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
+++ /dev/null
@@ -1,564 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/";
-SRC_URI="
-       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-       tools? (
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib 
static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-COMMON="
-       driver? ( kernel_linux? ( acct-group/video ) )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               gtk3? (
-                       x11-libs/gtk+:3
-               )
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf[X]
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libXxf86vm
-               x11-libs/pango[X]
-       )
-       X? (
-               >=app-eselect/eselect-opengl-1.0.9
-               app-misc/pax-utils
-       )
-"
-DEPEND="
-       ${COMMON}
-       kernel_linux? ( virtual/linux-sources )
-       tools? ( sys-apps/dbus )
-"
-RDEPEND="
-       ${COMMON}
-       tools? ( !media-video/nvidia-settings )
-       uvm? ( >=virtual/opencl-3 )
-       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*"
-S=${WORKDIR}/
-NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
-
-pkg_pretend() {
-       nvidia-driver_check
-}
-
-pkg_setup() {
-       nvidia-driver_check
-
-       # try to turn off distcc and ccache for people that have a problem with 
it
-       export DISTCC_DISABLE=1
-       export CCACHE_DISABLE=1
-
-       if use driver && use kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) 
nvidia-drm(video:${S}/kernel)"
-
-               # This needs to run after MODULE_NAMES (so that the eclass 
checks
-               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
-               # is set (so that KV_DIR is populated).
-               linux-mod_pkg_setup
-
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-               # linux-mod_src_compile calls set_arch_to_kernel, which
-               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
-               # expects x86_64 or i386 and then converts it to x86
-               # later on in the build process
-               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-       fi
-
-       if use kernel_linux && kernel_is lt 2 6 9; then
-               eerror "You must build this against 2.6.9 or higher kernels."
-       fi
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-               NV_DOC="${S}/doc"
-               NV_OBJ="${S}/obj"
-               NV_SRC="${S}/src"
-               NV_MAN="${S}/x11/man"
-               NV_X11="${S}/obj"
-               NV_SOVER=1
-       elif use kernel_linux; then
-               NV_DOC="${S}"
-               NV_OBJ="${S}"
-               NV_SRC="${S}/kernel"
-               NV_MAN="${S}"
-               NV_X11="${S}"
-               NV_SOVER=${PV}
-       else
-               die "Could not determine proper NVIDIA package"
-       fi
-}
-
-src_configure() {
-       tc-export AR CC LD OBJCOPY
-
-       default
-}
-
-src_prepare() {
-       local man_file
-       for man_file in "${NV_MAN}"/*1.gz; do
-               gunzip $man_file || die
-       done
-
-       if use tools; then
-               cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" 
|| die
-               cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || 
die
-               sed -i \
-                       -e "s:@PV@:${PV}:g" \
-                       "${WORKDIR}"/nvidia-settings-fno-common.patch \
-                       "${WORKDIR}"/nvidia-settings-linker.patch \
-                       || die
-               eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-               eapply "${WORKDIR}"/nvidia-settings-linker.patch
-       fi
-
-       default
-
-       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
-}
-
-src_compile() {
-       cd "${NV_SRC}"
-       if use kernel_FreeBSD; then
-               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
-                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-       elif use driver && use kernel_linux; then
-               BUILD_TARGETS=module linux-mod_src_compile \
-                       KERNELRELEASE="${KV_FULL}" \
-                       src="${KERNEL_DIR}"
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       DO_STRIP= \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       RANLIB="$(tc-getRANLIB)"
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=.
-       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() {
-       if use driver && use kernel_linux; then
-               linux-mod_src_install
-
-               # Add the aliases
-               # This file is tweaked with the appropriate video group in
-               # pkg_preinst, see bug #491414
-               insinto /etc/modprobe.d
-               newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-               if use uvm; then
-                       doins "${FILESDIR}"/nvidia-rmmod.conf
-                       udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 
99-nvidia-uvm.rules
-               else
-                       sed -e 's|nvidia-uvm ||g' 
"${FILESDIR}"/nvidia-rmmod.conf \
-                               > "${T}"/nvidia-rmmod.conf || die
-                       doins "${T}"/nvidia-rmmod.conf
-               fi
-
-               # Ensures that our device nodes are created when not using X
-               exeinto "$(get_udevdir)"
-               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-       elif use kernel_FreeBSD; then
-               if use x86-fbsd; then
-                       insinto /boot/modules
-                       doins "${S}/src/nvidia.kld"
-               fi
-
-               exeinto /boot/modules
-               doexe "${S}/src/nvidia.ko"
-       fi
-
-       # 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
-       if use kernel_linux; then
-               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-       fi
-
-       if use X; then
-               # Xorg DDX driver
-               insinto /usr/$(get_libdir)/xorg/modules/drivers
-               doins ${NV_X11}/nvidia_drv.so
-
-               # Xorg GLX driver
-               donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/xorg/modules/extensions
-
-               # Xorg nvidia.conf
-               if has_version '>=x11-base/xorg-server-1.16'; then
-                       insinto /usr/share/X11/xorg.conf.d
-                       newins {,50-}nvidia-drm-outputclass.conf
-               fi
-
-               insinto /usr/share/glvnd/egl_vendor.d
-               doins ${NV_X11}/10_nvidia.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins ${NV_X11}/10_nvidia_wayland.json
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-
-               insinto /etc/vulkan/icd.d
-               doins nvidia_icd.json
-       fi
-
-       if use kernel_linux; then
-               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
-
-               doman nvidia-cuda-mps-control.1
-               doman nvidia-modprobe.1
-               doman nvidia-persistenced.1
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
-               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       PREFIX=/usr \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/include/NVCtrl
-                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-               fi
-
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-
-               insinto /etc/nvidia
-               newins \
-                       nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || \
-                       doicon ${NV_OBJ}/nvidia-settings.png
-
-               domenu "${FILESDIR}"/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       systemd_dounit *.service
-       dobin nvidia-sleep.sh
-       exeinto $(systemd_get_utildir)/system-sleep
-       doexe nvidia
-
-       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"
-
-       # Documentation
-       if use kernel_FreeBSD; then
-               dodoc "${NV_DOC}/README"
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-       else
-               # Docs
-               newdoc "${NV_DOC}/README.txt" README
-               dodoc "${NV_DOC}/NVIDIA_Changelog"
-               doman "${NV_MAN}"/nvidia-smi.1
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-               doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-       fi
-
-       readme.gentoo_create_doc
-
-       docinto html
-       dodoc -r ${NV_DOC}/html/*
-}
-
-src_install-libs() {
-       local inslibdir=$(get_libdir)
-       local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
-       local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
-       local nv_libdir="${NV_OBJ}"
-
-       if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; 
then
-               nv_libdir="${NV_OBJ}"/32
-       fi
-
-       if use X; then
-               NV_GLX_LIBRARIES=(
-                       "libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
-                       "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-                       "libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
-                       "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
-                       "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-                       "libGLESv2.so.2.1.0 ${GL_ROOT}"
-                       "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-                       "libGLX.so.0 ${GL_ROOT}"
-                       "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-                       "libGLdispatch.so.0 ${GL_ROOT}"
-                       "libOpenCL.so.1.0.0 ${CL_ROOT}"
-                       "libOpenGL.so.0 ${GL_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-glvkspirv.so.${NV_SOVER}"
-                       "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.so.${NV_SOVER}"
-               )
-
-               if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" 
]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-egl-wayland.so.1.1.2"
-                       )
-               fi
-
-               if use kernel_FreeBSD; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-ml.so.${NV_SOVER}"
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-cbl.so.${NV_SOVER}"
-                               "libnvidia-rtcore.so.${NV_SOVER}"
-                               "libnvoptix.so.${NV_SOVER}"
-                       )
-               fi
-
-               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-                       donvidia "${nv_libdir}"/${NV_LIB}
-               done
-       fi
-}
-
-pkg_preinst() {
-       if use driver && use kernel_linux; then
-               linux-mod_pkg_preinst
-
-               local videogroup="$(getent group video | cut -d ':' -f 3)"
-               if [ -z "${videogroup}" ]; then
-                       eerror "Failed to determine the video group gid"
-                       die "Failed to determine the video group gid"
-               else
-                       sed -i \
-                               -e "s:PACKAGE:${PF}:g" \
-                               -e "s:VIDEOGID:${videogroup}:" \
-                               "${D}"/etc/modprobe.d/nvidia.conf || die
-               fi
-       fi
-
-       # Clean the dynamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-               rm -f "${ROOT}"/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       use driver && use kernel_linux && linux-mod_pkg_postinst
-
-       # Switch to the nvidia implementation
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-
-       readme.gentoo_print_elog
-
-       if ! use X; then
-               elog "You have elected 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 ! use tools; then
-               elog "USE=tools controls whether the nvidia-settings 
application"
-               elog "is installed. If you would like to use it, enable that"
-               elog "flag and re-emerge this ebuild. Optionally you can 
install"
-               elog "media-video/nvidia-settings"
-               elog
-       fi
-
-       elog "To enable nvidia sleep services under systemd, run these 
commands:"
-       elog "  systemctl enable nvidia-suspend.service"
-       elog "  systemctl enable nvidia-hibernate.service"
-       elog "  systemctl enable nvidia-resume.service"
-       elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-       elog "suitable path in case the default of /tmp does not work for you"
-       elog "For more information see:"
-       elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
-}
-
-pkg_prerm() {
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}
-
-pkg_postrm() {
-       use driver && use kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
deleted file mode 100644
index 655ae9ded1b..00000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/";
-SRC_URI="
-       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-       tools? (
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib 
static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-COMMON="
-       driver? ( kernel_linux? ( acct-group/video ) )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               gtk3? (
-                       x11-libs/gtk+:3
-               )
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf[X]
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libXxf86vm
-               x11-libs/pango[X]
-       )
-       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}
-       kernel_linux? ( virtual/linux-sources )
-       tools? ( sys-apps/dbus )
-"
-RDEPEND="
-       ${COMMON}
-       tools? ( !media-video/nvidia-settings )
-       uvm? ( >=virtual/opencl-3 )
-       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*"
-S=${WORKDIR}/
-NV_KV_MAX_PLUS="5.4"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
-
-pkg_pretend() {
-       nvidia-driver_check
-}
-
-pkg_setup() {
-       nvidia-driver_check
-
-       # try to turn off distcc and ccache for people that have a problem with 
it
-       export DISTCC_DISABLE=1
-       export CCACHE_DISABLE=1
-
-       if use driver && use kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) 
nvidia-drm(video:${S}/kernel)"
-
-               # This needs to run after MODULE_NAMES (so that the eclass 
checks
-               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
-               # is set (so that KV_DIR is populated).
-               linux-mod_pkg_setup
-
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-               # linux-mod_src_compile calls set_arch_to_kernel, which
-               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
-               # expects x86_64 or i386 and then converts it to x86
-               # later on in the build process
-               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-       fi
-
-       if use kernel_linux && kernel_is lt 2 6 9; then
-               eerror "You must build this against 2.6.9 or higher kernels."
-       fi
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-               NV_DOC="${S}/doc"
-               NV_OBJ="${S}/obj"
-               NV_SRC="${S}/src"
-               NV_MAN="${S}/x11/man"
-               NV_X11="${S}/obj"
-               NV_SOVER=1
-       elif use kernel_linux; then
-               NV_DOC="${S}"
-               NV_OBJ="${S}"
-               NV_SRC="${S}/kernel"
-               NV_MAN="${S}"
-               NV_X11="${S}"
-               NV_SOVER=${PV}
-       else
-               die "Could not determine proper NVIDIA package"
-       fi
-}
-
-src_configure() {
-       tc-export AR CC LD OBJCOPY
-
-       default
-}
-
-src_prepare() {
-       local man_file
-       for man_file in "${NV_MAN}"/*1.gz; do
-               gunzip $man_file || die
-       done
-
-       if use tools; then
-               cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" 
|| die
-               cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || 
die
-               sed -i \
-                       -e "s:@PV@:${PV}:g" \
-                       "${WORKDIR}"/nvidia-settings-fno-common.patch \
-                       "${WORKDIR}"/nvidia-settings-linker.patch \
-                       || die
-               eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-               eapply "${WORKDIR}"/nvidia-settings-linker.patch
-       fi
-
-       default
-
-       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
-}
-
-src_compile() {
-       cd "${NV_SRC}"
-       if use kernel_FreeBSD; then
-               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
-                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-       elif use driver && use kernel_linux; then
-               BUILD_TARGETS=module linux-mod_src_compile \
-                       KERNELRELEASE="${KV_FULL}" \
-                       src="${KERNEL_DIR}"
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       DO_STRIP= \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       RANLIB="$(tc-getRANLIB)"
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=.
-       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() {
-       if use driver && use kernel_linux; then
-               linux-mod_src_install
-
-               # Add the aliases
-               # This file is tweaked with the appropriate video group in
-               # pkg_preinst, see bug #491414
-               insinto /etc/modprobe.d
-               newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-               if use uvm; then
-                       doins "${FILESDIR}"/nvidia-rmmod.conf
-                       udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 
99-nvidia-uvm.rules
-               else
-                       sed -e 's|nvidia-uvm ||g' 
"${FILESDIR}"/nvidia-rmmod.conf \
-                               > "${T}"/nvidia-rmmod.conf || die
-                       doins "${T}"/nvidia-rmmod.conf
-               fi
-
-               # Ensures that our device nodes are created when not using X
-               exeinto "$(get_udevdir)"
-               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-       elif use kernel_FreeBSD; then
-               if use x86-fbsd; then
-                       insinto /boot/modules
-                       doins "${S}/src/nvidia.kld"
-               fi
-
-               exeinto /boot/modules
-               doexe "${S}/src/nvidia.ko"
-       fi
-
-       # 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
-       if use kernel_linux; then
-               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-       fi
-
-       if use X; then
-               # Xorg DDX driver
-               insinto /usr/$(get_libdir)/xorg/modules/drivers
-               doins ${NV_X11}/nvidia_drv.so
-
-               # Xorg GLX driver
-               donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/xorg/modules/extensions
-
-               # Xorg nvidia.conf
-               if has_version '>=x11-base/xorg-server-1.16'; then
-                       insinto /usr/share/X11/xorg.conf.d
-                       newins {,50-}nvidia-drm-outputclass.conf
-               fi
-
-               insinto /usr/share/glvnd/egl_vendor.d
-               doins ${NV_X11}/10_nvidia.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins ${NV_X11}/10_nvidia_wayland.json
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-
-               insinto /etc/vulkan/icd.d
-               doins nvidia_icd.json
-       fi
-
-       if use kernel_linux; then
-               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
-
-               doman nvidia-cuda-mps-control.1
-               doman nvidia-modprobe.1
-               doman nvidia-persistenced.1
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
-               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       PREFIX=/usr \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/include/NVCtrl
-                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-               fi
-
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-
-               insinto /etc/nvidia
-               newins \
-                       nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || \
-                       doicon ${NV_OBJ}/nvidia-settings.png
-
-               domenu "${FILESDIR}"/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       systemd_dounit *.service
-       dobin nvidia-sleep.sh
-       exeinto $(systemd_get_utildir)/system-sleep
-       doexe nvidia
-
-       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"
-
-       # Documentation
-       if use kernel_FreeBSD; then
-               dodoc "${NV_DOC}/README"
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-       else
-               # Docs
-               newdoc "${NV_DOC}/README.txt" README
-               dodoc "${NV_DOC}/NVIDIA_Changelog"
-               doman "${NV_MAN}"/nvidia-smi.1
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-               doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-       fi
-
-       readme.gentoo_create_doc
-
-       docinto html
-       dodoc -r ${NV_DOC}/html/*
-}
-
-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 use kernel_linux && 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-glvkspirv.so.${NV_SOVER}"
-                       "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.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.1.3"
-                       )
-               fi
-
-               if use kernel_FreeBSD; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-ml.so.${NV_SOVER}"
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-cbl.so.${NV_SOVER}"
-                               "libnvidia-rtcore.so.${NV_SOVER}"
-                               "libnvoptix.so.${NV_SOVER}"
-                       )
-               fi
-
-               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-                       donvidia "${nv_libdir}"/${NV_LIB}
-               done
-       fi
-}
-
-pkg_preinst() {
-       if use driver && use kernel_linux; then
-               linux-mod_pkg_preinst
-
-               local videogroup="$(getent group video | cut -d ':' -f 3)"
-               if [ -z "${videogroup}" ]; then
-                       eerror "Failed to determine the video group gid"
-                       die "Failed to determine the video group gid"
-               else
-                       sed -i \
-                               -e "s:PACKAGE:${PF}:g" \
-                               -e "s:VIDEOGID:${videogroup}:" \
-                               "${D}"/etc/modprobe.d/nvidia.conf || die
-               fi
-       fi
-
-       # Clean the dynamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-               rm -f "${ROOT}"/etc/env.d/09nvidia
-       fi
-}
-
-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
-               elog "You have elected 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 ! use tools; then
-               elog "USE=tools controls whether the nvidia-settings 
application"
-               elog "is installed. If you would like to use it, enable that"
-               elog "flag and re-emerge this ebuild. Optionally you can 
install"
-               elog "media-video/nvidia-settings"
-               elog
-       fi
-
-       elog "To enable nvidia sleep services under systemd, run these 
commands:"
-       elog "  systemctl enable nvidia-suspend.service"
-       elog "  systemctl enable nvidia-hibernate.service"
-       elog "  systemctl enable nvidia-resume.service"
-       elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-       elog "suitable path in case the default of /tmp does not work for you"
-       elog "For more information see:"
-       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.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild
deleted file mode 100644
index 74a74069bf6..00000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild
+++ /dev/null
@@ -1,585 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/";
-SRC_URI="
-       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-       tools? (
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib 
static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-COMMON="
-       driver? ( kernel_linux? ( acct-group/video ) )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               gtk3? (
-                       x11-libs/gtk+:3
-               )
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf[X]
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libXxf86vm
-               x11-libs/pango[X]
-       )
-       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}
-       kernel_linux? ( virtual/linux-sources )
-       tools? ( sys-apps/dbus )
-"
-RDEPEND="
-       ${COMMON}
-       tools? ( !media-video/nvidia-settings )
-       uvm? ( >=virtual/opencl-3 )
-       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*"
-S=${WORKDIR}/
-PATCHES=(
-       "${FILESDIR}"/${PN}-440.26-locale.patch
-)
-NV_KV_MAX_PLUS="5.8"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
-
-pkg_pretend() {
-       nvidia-driver_check
-}
-
-pkg_setup() {
-       nvidia-driver_check
-
-       # try to turn off distcc and ccache for people that have a problem with 
it
-       export DISTCC_DISABLE=1
-       export CCACHE_DISABLE=1
-
-       if use driver && use kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) 
nvidia-drm(video:${S}/kernel)"
-
-               # This needs to run after MODULE_NAMES (so that the eclass 
checks
-               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
-               # is set (so that KV_DIR is populated).
-               linux-mod_pkg_setup
-
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-               # linux-mod_src_compile calls set_arch_to_kernel, which
-               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
-               # expects x86_64 or i386 and then converts it to x86
-               # later on in the build process
-               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-       fi
-
-       if use kernel_linux && kernel_is lt 2 6 9; then
-               eerror "You must build this against 2.6.9 or higher kernels."
-       fi
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-               NV_DOC="${S}/doc"
-               NV_OBJ="${S}/obj"
-               NV_SRC="${S}/src"
-               NV_MAN="${S}/x11/man"
-               NV_X11="${S}/obj"
-               NV_SOVER=1
-       elif use kernel_linux; then
-               NV_DOC="${S}"
-               NV_OBJ="${S}"
-               NV_SRC="${S}/kernel"
-               NV_MAN="${S}"
-               NV_X11="${S}"
-               NV_SOVER=${PV}
-       else
-               die "Could not determine proper NVIDIA package"
-       fi
-}
-
-src_configure() {
-       tc-export AR CC LD OBJCOPY
-
-       default
-}
-
-src_prepare() {
-       local man_file
-       for man_file in "${NV_MAN}"/*1.gz; do
-               gunzip $man_file || die
-       done
-
-       if use tools; then
-               cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || 
die
-               sed -i \
-                       -e "s:@PV@:${PV}:g" \
-                       "${WORKDIR}"/nvidia-settings-linker.patch \
-                       || die
-               eapply "${WORKDIR}"/nvidia-settings-linker.patch
-       fi
-
-       default
-
-       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
-}
-
-src_compile() {
-       cd "${NV_SRC}"
-       if use kernel_FreeBSD; then
-               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
-                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-       elif use driver && use kernel_linux; then
-               BUILD_TARGETS=module linux-mod_src_compile \
-                       KERNELRELEASE="${KV_FULL}" \
-                       src="${KERNEL_DIR}"
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       DO_STRIP= \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       RANLIB="$(tc-getRANLIB)"
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=.
-       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() {
-       if use driver && use kernel_linux; then
-               linux-mod_src_install
-
-               # Add the aliases
-               # This file is tweaked with the appropriate video group in
-               # pkg_preinst, see bug #491414
-               insinto /etc/modprobe.d
-               newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-               if use uvm; then
-                       doins "${FILESDIR}"/nvidia-rmmod.conf
-                       udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 
99-nvidia-uvm.rules
-               else
-                       sed -e 's|nvidia-uvm ||g' 
"${FILESDIR}"/nvidia-rmmod.conf \
-                               > "${T}"/nvidia-rmmod.conf || die
-                       doins "${T}"/nvidia-rmmod.conf
-               fi
-
-               # Ensures that our device nodes are created when not using X
-               exeinto "$(get_udevdir)"
-               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-       elif use kernel_FreeBSD; then
-               if use x86-fbsd; then
-                       insinto /boot/modules
-                       doins "${S}/src/nvidia.kld"
-               fi
-
-               exeinto /boot/modules
-               doexe "${S}/src/nvidia.ko"
-       fi
-
-       # 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
-       if use kernel_linux; then
-               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-       fi
-
-       if use X; then
-               # Xorg DDX driver
-               insinto /usr/$(get_libdir)/xorg/modules/drivers
-               doins ${NV_X11}/nvidia_drv.so
-
-               # Xorg GLX driver
-               donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/xorg/modules/extensions
-
-               # Xorg nvidia.conf
-               if has_version '>=x11-base/xorg-server-1.16'; then
-                       insinto /usr/share/X11/xorg.conf.d
-                       newins {,50-}nvidia-drm-outputclass.conf
-               fi
-
-               insinto /usr/share/glvnd/egl_vendor.d
-               doins ${NV_X11}/10_nvidia.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins ${NV_X11}/10_nvidia_wayland.json
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-
-               insinto /etc/vulkan/icd.d
-               doins nvidia_icd.json
-
-               insinto /etc/vulkan/implicit_layer.d
-               doins nvidia_layers.json
-       fi
-
-       if use kernel_linux; then
-               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
-
-               doman nvidia-cuda-mps-control.1
-               doman nvidia-modprobe.1
-               doman nvidia-persistenced.1
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
-               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       PREFIX=/usr \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/include/NVCtrl
-                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-               fi
-
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-
-               insinto /etc/nvidia
-               newins \
-                       nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || \
-                       doicon ${NV_OBJ}/nvidia-settings.png
-
-               domenu "${FILESDIR}"/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       systemd_dounit *.service
-       dobin nvidia-sleep.sh
-       exeinto $(systemd_get_utildir)/system-sleep
-       doexe nvidia
-
-       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"
-
-       # Documentation
-       if use kernel_FreeBSD; then
-               dodoc "${NV_DOC}/README"
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-       else
-               # Docs
-               newdoc "${NV_DOC}/README.txt" README
-               dodoc "${NV_DOC}/NVIDIA_Changelog"
-               doman "${NV_MAN}"/nvidia-smi.1
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-               doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-       fi
-
-       readme.gentoo_create_doc
-
-       docinto html
-       dodoc -r ${NV_DOC}/html/*
-}
-
-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 use kernel_linux && 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-glvkspirv.so.${NV_SOVER}"
-                       "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.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.1.4"
-                       )
-               fi
-
-               if use kernel_FreeBSD; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-ml.so.${NV_SOVER}"
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-cbl.so.${NV_SOVER}"
-                               "libnvidia-rtcore.so.${NV_SOVER}"
-                               "libnvoptix.so.${NV_SOVER}"
-                       )
-               fi
-
-               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-                       donvidia "${nv_libdir}"/${NV_LIB}
-               done
-       fi
-}
-
-pkg_preinst() {
-       if use driver && use kernel_linux; then
-               linux-mod_pkg_preinst
-
-               local videogroup="$(getent group video | cut -d ':' -f 3)"
-               if [ -z "${videogroup}" ]; then
-                       eerror "Failed to determine the video group gid"
-                       die "Failed to determine the video group gid"
-               else
-                       sed -i \
-                               -e "s:PACKAGE:${PF}:g" \
-                               -e "s:VIDEOGID:${videogroup}:" \
-                               "${D}"/etc/modprobe.d/nvidia.conf || die
-               fi
-       fi
-
-       # Clean the dynamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-               rm -f "${ROOT}"/etc/env.d/09nvidia
-       fi
-}
-
-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
-               elog "You have elected 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 ! use tools; then
-               elog "USE=tools controls whether the nvidia-settings 
application"
-               elog "is installed. If you would like to use it, enable that"
-               elog "flag and re-emerge this ebuild. Optionally you can 
install"
-               elog "media-video/nvidia-settings"
-               elog
-       fi
-
-       elog "To enable nvidia sleep services under systemd, run these 
commands:"
-       elog "  systemctl enable nvidia-suspend.service"
-       elog "  systemctl enable nvidia-hibernate.service"
-       elog "  systemctl enable nvidia-resume.service"
-       elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-       elog "suitable path in case the default of /tmp does not work for you"
-       elog "For more information see:"
-       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.82-r3.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
deleted file mode 100644
index 325a3407e3e..00000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
+++ /dev/null
@@ -1,588 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/";
-SRC_URI="
-       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-       tools? (
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib 
static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-COMMON="
-       driver? ( kernel_linux? ( acct-group/video ) )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               gtk3? (
-                       x11-libs/gtk+:3
-               )
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf[X]
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libXxf86vm
-               x11-libs/pango[X]
-       )
-       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}
-       kernel_linux? ( virtual/linux-sources )
-       tools? ( sys-apps/dbus )
-"
-RDEPEND="
-       ${COMMON}
-       tools? ( !media-video/nvidia-settings )
-       uvm? ( >=virtual/opencl-3 )
-       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*"
-S=${WORKDIR}/
-PATCHES=(
-       "${FILESDIR}"/${PN}-440.26-locale.patch
-)
-NV_KV_MAX_PLUS="5.7"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
-
-pkg_pretend() {
-       nvidia-driver_check
-}
-
-pkg_setup() {
-       nvidia-driver_check
-
-       # try to turn off distcc and ccache for people that have a problem with 
it
-       export DISTCC_DISABLE=1
-       export CCACHE_DISABLE=1
-
-       if use driver && use kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) 
nvidia-drm(video:${S}/kernel)"
-
-               # This needs to run after MODULE_NAMES (so that the eclass 
checks
-               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
-               # is set (so that KV_DIR is populated).
-               linux-mod_pkg_setup
-
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-               # linux-mod_src_compile calls set_arch_to_kernel, which
-               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
-               # expects x86_64 or i386 and then converts it to x86
-               # later on in the build process
-               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-       fi
-
-       if use kernel_linux && kernel_is lt 2 6 9; then
-               eerror "You must build this against 2.6.9 or higher kernels."
-       fi
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-               NV_DOC="${S}/doc"
-               NV_OBJ="${S}/obj"
-               NV_SRC="${S}/src"
-               NV_MAN="${S}/x11/man"
-               NV_X11="${S}/obj"
-               NV_SOVER=1
-       elif use kernel_linux; then
-               NV_DOC="${S}"
-               NV_OBJ="${S}"
-               NV_SRC="${S}/kernel"
-               NV_MAN="${S}"
-               NV_X11="${S}"
-               NV_SOVER=${PV}
-       else
-               die "Could not determine proper NVIDIA package"
-       fi
-}
-
-src_configure() {
-       tc-export AR CC LD OBJCOPY
-
-       default
-}
-
-src_prepare() {
-       local man_file
-       for man_file in "${NV_MAN}"/*1.gz; do
-               gunzip $man_file || die
-       done
-
-       if use tools; then
-               cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" 
|| die
-               cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || 
die
-               sed -i \
-                       -e "s:@PV@:${PV}:g" \
-                       "${WORKDIR}"/nvidia-settings-fno-common.patch \
-                       "${WORKDIR}"/nvidia-settings-linker.patch \
-                       || die
-               eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-               eapply "${WORKDIR}"/nvidia-settings-linker.patch
-       fi
-
-       default
-
-       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
-}
-
-src_compile() {
-       cd "${NV_SRC}"
-       if use kernel_FreeBSD; then
-               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
-                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-       elif use driver && use kernel_linux; then
-               BUILD_TARGETS=module linux-mod_src_compile \
-                       KERNELRELEASE="${KV_FULL}" \
-                       src="${KERNEL_DIR}"
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       DO_STRIP= \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       RANLIB="$(tc-getRANLIB)"
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=.
-       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() {
-       if use driver && use kernel_linux; then
-               linux-mod_src_install
-
-               # Add the aliases
-               # This file is tweaked with the appropriate video group in
-               # pkg_preinst, see bug #491414
-               insinto /etc/modprobe.d
-               newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-               if use uvm; then
-                       doins "${FILESDIR}"/nvidia-rmmod.conf
-                       udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 
99-nvidia-uvm.rules
-               else
-                       sed -e 's|nvidia-uvm ||g' 
"${FILESDIR}"/nvidia-rmmod.conf \
-                               > "${T}"/nvidia-rmmod.conf || die
-                       doins "${T}"/nvidia-rmmod.conf
-               fi
-
-               # Ensures that our device nodes are created when not using X
-               exeinto "$(get_udevdir)"
-               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-       elif use kernel_FreeBSD; then
-               if use x86-fbsd; then
-                       insinto /boot/modules
-                       doins "${S}/src/nvidia.kld"
-               fi
-
-               exeinto /boot/modules
-               doexe "${S}/src/nvidia.ko"
-       fi
-
-       # 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
-       if use kernel_linux; then
-               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-       fi
-
-       if use X; then
-               # Xorg DDX driver
-               insinto /usr/$(get_libdir)/xorg/modules/drivers
-               doins ${NV_X11}/nvidia_drv.so
-
-               # Xorg GLX driver
-               donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/xorg/modules/extensions
-
-               # Xorg nvidia.conf
-               if has_version '>=x11-base/xorg-server-1.16'; then
-                       insinto /usr/share/X11/xorg.conf.d
-                       newins {,50-}nvidia-drm-outputclass.conf
-               fi
-
-               insinto /usr/share/glvnd/egl_vendor.d
-               doins ${NV_X11}/10_nvidia.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins ${NV_X11}/10_nvidia_wayland.json
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-
-               insinto /etc/vulkan/icd.d
-               doins nvidia_icd.json
-
-               insinto /etc/vulkan/implicit_layer.d
-               doins nvidia_layers.json
-       fi
-
-       if use kernel_linux; then
-               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
-
-               doman nvidia-cuda-mps-control.1
-               doman nvidia-modprobe.1
-               doman nvidia-persistenced.1
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
-               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       PREFIX=/usr \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/include/NVCtrl
-                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-               fi
-
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-
-               insinto /etc/nvidia
-               newins \
-                       nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || \
-                       doicon ${NV_OBJ}/nvidia-settings.png
-
-               domenu "${FILESDIR}"/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       systemd_dounit *.service
-       dobin nvidia-sleep.sh
-       exeinto /lib/systemd/system-sleep
-       doexe nvidia
-
-       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"
-
-       # Documentation
-       if use kernel_FreeBSD; then
-               dodoc "${NV_DOC}/README"
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-       else
-               # Docs
-               newdoc "${NV_DOC}/README.txt" README
-               dodoc "${NV_DOC}/NVIDIA_Changelog"
-               doman "${NV_MAN}"/nvidia-smi.1
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-               doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-       fi
-
-       readme.gentoo_create_doc
-
-       docinto html
-       dodoc -r ${NV_DOC}/html/*
-}
-
-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 use kernel_linux && 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-glvkspirv.so.${NV_SOVER}"
-                       "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.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.1.4"
-                       )
-               fi
-
-               if use kernel_FreeBSD; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-ml.so.${NV_SOVER}"
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-cbl.so.${NV_SOVER}"
-                               "libnvidia-rtcore.so.${NV_SOVER}"
-                               "libnvoptix.so.${NV_SOVER}"
-                       )
-               fi
-
-               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-                       donvidia "${nv_libdir}"/${NV_LIB}
-               done
-       fi
-}
-
-pkg_preinst() {
-       if use driver && use kernel_linux; then
-               linux-mod_pkg_preinst
-
-               local videogroup="$(getent group video | cut -d ':' -f 3)"
-               if [ -z "${videogroup}" ]; then
-                       eerror "Failed to determine the video group gid"
-                       die "Failed to determine the video group gid"
-               else
-                       sed -i \
-                               -e "s:PACKAGE:${PF}:g" \
-                               -e "s:VIDEOGID:${videogroup}:" \
-                               "${D}"/etc/modprobe.d/nvidia.conf || die
-               fi
-       fi
-
-       # Clean the dynamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-               rm -f "${ROOT}"/etc/env.d/09nvidia
-       fi
-}
-
-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
-               elog "You have elected 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 ! use tools; then
-               elog "USE=tools controls whether the nvidia-settings 
application"
-               elog "is installed. If you would like to use it, enable that"
-               elog "flag and re-emerge this ebuild. Optionally you can 
install"
-               elog "media-video/nvidia-settings"
-               elog
-       fi
-
-       elog "To enable nvidia sleep services under systemd, run these 
commands:"
-       elog "  systemctl enable nvidia-suspend.service"
-       elog "  systemctl enable nvidia-hibernate.service"
-       elog "  systemctl enable nvidia-resume.service"
-       elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-       elog "suitable path in case the default of /tmp does not work for you"
-       elog "For more information see:"
-       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.82-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild
deleted file mode 100644
index 64fbf07f8a8..00000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r4.ebuild
+++ /dev/null
@@ -1,588 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/";
-SRC_URI="
-       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-       tools? (
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib 
static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-COMMON="
-       driver? ( kernel_linux? ( acct-group/video ) )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               gtk3? (
-                       x11-libs/gtk+:3
-               )
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf[X]
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libXxf86vm
-               x11-libs/pango[X]
-       )
-       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}
-       kernel_linux? ( virtual/linux-sources )
-       tools? ( sys-apps/dbus )
-"
-RDEPEND="
-       ${COMMON}
-       tools? ( !media-video/nvidia-settings )
-       uvm? ( >=virtual/opencl-3 )
-       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*"
-S=${WORKDIR}/
-PATCHES=(
-       "${FILESDIR}"/${PN}-440.26-locale.patch
-)
-NV_KV_MAX_PLUS="5.7"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
-
-pkg_pretend() {
-       nvidia-driver_check
-}
-
-pkg_setup() {
-       nvidia-driver_check
-
-       # try to turn off distcc and ccache for people that have a problem with 
it
-       export DISTCC_DISABLE=1
-       export CCACHE_DISABLE=1
-
-       if use driver && use kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) 
nvidia-drm(video:${S}/kernel)"
-
-               # This needs to run after MODULE_NAMES (so that the eclass 
checks
-               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
-               # is set (so that KV_DIR is populated).
-               linux-mod_pkg_setup
-
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-               # linux-mod_src_compile calls set_arch_to_kernel, which
-               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
-               # expects x86_64 or i386 and then converts it to x86
-               # later on in the build process
-               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-       fi
-
-       if use kernel_linux && kernel_is lt 2 6 9; then
-               eerror "You must build this against 2.6.9 or higher kernels."
-       fi
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-               NV_DOC="${S}/doc"
-               NV_OBJ="${S}/obj"
-               NV_SRC="${S}/src"
-               NV_MAN="${S}/x11/man"
-               NV_X11="${S}/obj"
-               NV_SOVER=1
-       elif use kernel_linux; then
-               NV_DOC="${S}"
-               NV_OBJ="${S}"
-               NV_SRC="${S}/kernel"
-               NV_MAN="${S}"
-               NV_X11="${S}"
-               NV_SOVER=${PV}
-       else
-               die "Could not determine proper NVIDIA package"
-       fi
-}
-
-src_configure() {
-       tc-export AR CC LD OBJCOPY
-
-       default
-}
-
-src_prepare() {
-       local man_file
-       for man_file in "${NV_MAN}"/*1.gz; do
-               gunzip $man_file || die
-       done
-
-       if use tools; then
-               cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" 
|| die
-               cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || 
die
-               sed -i \
-                       -e "s:@PV@:${PV}:g" \
-                       "${WORKDIR}"/nvidia-settings-fno-common.patch \
-                       "${WORKDIR}"/nvidia-settings-linker.patch \
-                       || die
-               eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
-               eapply "${WORKDIR}"/nvidia-settings-linker.patch
-       fi
-
-       default
-
-       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
-}
-
-src_compile() {
-       cd "${NV_SRC}"
-       if use kernel_FreeBSD; then
-               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
-                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-       elif use driver && use kernel_linux; then
-               BUILD_TARGETS=module linux-mod_src_compile \
-                       KERNELRELEASE="${KV_FULL}" \
-                       src="${KERNEL_DIR}"
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       DO_STRIP= \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       RANLIB="$(tc-getRANLIB)"
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=.
-       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() {
-       if use driver && use kernel_linux; then
-               linux-mod_src_install
-
-               # Add the aliases
-               # This file is tweaked with the appropriate video group in
-               # pkg_preinst, see bug #491414
-               insinto /etc/modprobe.d
-               newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-               if use uvm; then
-                       doins "${FILESDIR}"/nvidia-rmmod.conf
-                       udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 
99-nvidia-uvm.rules
-               else
-                       sed -e 's|nvidia-uvm ||g' 
"${FILESDIR}"/nvidia-rmmod.conf \
-                               > "${T}"/nvidia-rmmod.conf || die
-                       doins "${T}"/nvidia-rmmod.conf
-               fi
-
-               # Ensures that our device nodes are created when not using X
-               exeinto "$(get_udevdir)"
-               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-       elif use kernel_FreeBSD; then
-               if use x86-fbsd; then
-                       insinto /boot/modules
-                       doins "${S}/src/nvidia.kld"
-               fi
-
-               exeinto /boot/modules
-               doexe "${S}/src/nvidia.ko"
-       fi
-
-       # 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
-       if use kernel_linux; then
-               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-       fi
-
-       if use X; then
-               # Xorg DDX driver
-               insinto /usr/$(get_libdir)/xorg/modules/drivers
-               doins ${NV_X11}/nvidia_drv.so
-
-               # Xorg GLX driver
-               donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/xorg/modules/extensions
-
-               # Xorg nvidia.conf
-               if has_version '>=x11-base/xorg-server-1.16'; then
-                       insinto /usr/share/X11/xorg.conf.d
-                       newins {,50-}nvidia-drm-outputclass.conf
-               fi
-
-               insinto /usr/share/glvnd/egl_vendor.d
-               doins ${NV_X11}/10_nvidia.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins ${NV_X11}/10_nvidia_wayland.json
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-
-               insinto /etc/vulkan/icd.d
-               doins nvidia_icd.json
-
-               insinto /etc/vulkan/implicit_layer.d
-               doins nvidia_layers.json
-       fi
-
-       if use kernel_linux; then
-               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
-
-               doman nvidia-cuda-mps-control.1
-               doman nvidia-modprobe.1
-               doman nvidia-persistenced.1
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
-               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       PREFIX=/usr \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/include/NVCtrl
-                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-               fi
-
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-
-               insinto /etc/nvidia
-               newins \
-                       nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || \
-                       doicon ${NV_OBJ}/nvidia-settings.png
-
-               domenu "${FILESDIR}"/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       systemd_dounit *.service
-       dobin nvidia-sleep.sh
-       exeinto /lib/systemd/system-sleep
-       doexe nvidia
-
-       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"
-
-       # Documentation
-       if use kernel_FreeBSD; then
-               dodoc "${NV_DOC}/README"
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-       else
-               # Docs
-               newdoc "${NV_DOC}/README.txt" README
-               dodoc "${NV_DOC}/NVIDIA_Changelog"
-               doman "${NV_MAN}"/nvidia-smi.1
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-               doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-       fi
-
-       readme.gentoo_create_doc
-
-       docinto html
-       dodoc -r ${NV_DOC}/html/*
-}
-
-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 use kernel_linux && 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-glvkspirv.so.${NV_SOVER}"
-                       "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.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.1.4"
-                       )
-               fi
-
-               if use kernel_FreeBSD; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-ml.so.${NV_SOVER}"
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-cbl.so.${NV_SOVER}"
-                               "libnvidia-rtcore.so.${NV_SOVER}"
-                               "libnvoptix.so.${NV_SOVER}"
-                       )
-               fi
-
-               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-                       donvidia "${nv_libdir}"/${NV_LIB}
-               done
-       fi
-}
-
-pkg_preinst() {
-       if use driver && use kernel_linux; then
-               linux-mod_pkg_preinst
-
-               local videogroup="$(getent group video | cut -d ':' -f 3)"
-               if [ -z "${videogroup}" ]; then
-                       eerror "Failed to determine the video group gid"
-                       die "Failed to determine the video group gid"
-               else
-                       sed -i \
-                               -e "s:PACKAGE:${PF}:g" \
-                               -e "s:VIDEOGID:${videogroup}:" \
-                               "${D}"/etc/modprobe.d/nvidia.conf || die
-               fi
-       fi
-
-       # Clean the dynamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-               rm -f "${ROOT}"/etc/env.d/09nvidia
-       fi
-}
-
-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
-               elog "You have elected 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 ! use tools; then
-               elog "USE=tools controls whether the nvidia-settings 
application"
-               elog "is installed. If you would like to use it, enable that"
-               elog "flag and re-emerge this ebuild. Optionally you can 
install"
-               elog "media-video/nvidia-settings"
-               elog
-       fi
-
-       elog "To enable nvidia sleep services under systemd, run these 
commands:"
-       elog "  systemctl enable nvidia-suspend.service"
-       elog "  systemctl enable nvidia-hibernate.service"
-       elog "  systemctl enable nvidia-resume.service"
-       elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-       elog "suitable path in case the default of /tmp does not work for you"
-       elog "For more information see:"
-       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.51.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild
deleted file mode 100644
index 7341c1529ac..00000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
-       nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/";
-SRC_URI="
-       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-       tools? (
-               
https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
-       )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib 
static-libs +tools uvm wayland +X"
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-COMMON="
-       driver? ( kernel_linux? ( acct-group/video ) )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               gtk3? (
-                       x11-libs/gtk+:3
-               )
-               x11-libs/cairo
-               x11-libs/gdk-pixbuf[X]
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/libXrandr
-               x11-libs/libXv
-               x11-libs/libXxf86vm
-               x11-libs/pango[X]
-       )
-       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}
-       kernel_linux? ( virtual/linux-sources )
-       tools? ( sys-apps/dbus )
-"
-RDEPEND="
-       ${COMMON}
-       tools? ( !media-video/nvidia-settings )
-       uvm? ( >=virtual/opencl-3 )
-       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}]
-       )
-       kernel_linux? ( net-libs/libtirpc )
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-PATCHES=(
-       "${FILESDIR}"/${PN}-440.26-locale.patch
-)
-NV_KV_MAX_PLUS="5.8"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
-
-pkg_pretend() {
-       nvidia-driver_check
-}
-
-pkg_setup() {
-       nvidia-driver_check
-
-       # try to turn off distcc and ccache for people that have a problem with 
it
-       export DISTCC_DISABLE=1
-       export CCACHE_DISABLE=1
-
-       if use driver && use kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
-               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) 
nvidia-drm(video:${S}/kernel)"
-
-               # This needs to run after MODULE_NAMES (so that the eclass 
checks
-               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
-               # is set (so that KV_DIR is populated).
-               linux-mod_pkg_setup
-
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
-               # linux-mod_src_compile calls set_arch_to_kernel, which
-               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
-               # expects x86_64 or i386 and then converts it to x86
-               # later on in the build process
-               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
-       fi
-
-       if use kernel_linux && kernel_is lt 2 6 9; then
-               eerror "You must build this against 2.6.9 or higher kernels."
-       fi
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
-               NV_DOC="${S}/doc"
-               NV_OBJ="${S}/obj"
-               NV_SRC="${S}/src"
-               NV_MAN="${S}/x11/man"
-               NV_X11="${S}/obj"
-               NV_SOVER=1
-       elif use kernel_linux; then
-               NV_DOC="${S}"
-               NV_OBJ="${S}"
-               NV_SRC="${S}/kernel"
-               NV_MAN="${S}"
-               NV_X11="${S}"
-               NV_SOVER=${PV}
-       else
-               die "Could not determine proper NVIDIA package"
-       fi
-}
-
-src_configure() {
-       tc-export AR CC LD OBJCOPY
-
-       default
-}
-
-src_prepare() {
-       local man_file
-       for man_file in "${NV_MAN}"/*1.gz; do
-               gunzip $man_file || die
-       done
-
-       if use tools; then
-               cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || 
die
-               sed -i \
-                       -e "s:@PV@:${PV}:g" \
-                       "${WORKDIR}"/nvidia-settings-linker.patch \
-                       || die
-               eapply "${WORKDIR}"/nvidia-settings-linker.patch
-       fi
-
-       default
-
-       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
-}
-
-src_compile() {
-       cd "${NV_SRC}"
-       if use kernel_FreeBSD; then
-               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
-                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-       elif use driver && use kernel_linux; then
-               BUILD_TARGETS=module linux-mod_src_compile \
-                       KERNELRELEASE="${KV_FULL}" \
-                       src="${KERNEL_DIR}"
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       DO_STRIP= \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       RANLIB="$(tc-getRANLIB)"
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="$(get_libdir)" \
-                       NVLD="$(tc-getLD)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=.
-       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() {
-       if use driver && use kernel_linux; then
-               linux-mod_src_install
-
-               # Add the aliases
-               # This file is tweaked with the appropriate video group in
-               # pkg_preinst, see bug #491414
-               insinto /etc/modprobe.d
-               newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
-               if use uvm; then
-                       doins "${FILESDIR}"/nvidia-rmmod.conf
-                       udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 
99-nvidia-uvm.rules
-               else
-                       sed -e 's|nvidia-uvm ||g' 
"${FILESDIR}"/nvidia-rmmod.conf \
-                               > "${T}"/nvidia-rmmod.conf || die
-                       doins "${T}"/nvidia-rmmod.conf
-               fi
-
-               # Ensures that our device nodes are created when not using X
-               exeinto "$(get_udevdir)"
-               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-       elif use kernel_FreeBSD; then
-               if use x86-fbsd; then
-                       insinto /boot/modules
-                       doins "${S}/src/nvidia.kld"
-               fi
-
-               exeinto /boot/modules
-               doexe "${S}/src/nvidia.ko"
-       fi
-
-       # 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
-       if use kernel_linux; then
-               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-       fi
-
-       if use X; then
-               # Xorg DDX driver
-               insinto /usr/$(get_libdir)/xorg/modules/drivers
-               doins ${NV_X11}/nvidia_drv.so
-
-               # Xorg GLX driver
-               donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/xorg/modules/extensions
-
-               # Xorg nvidia.conf
-               if has_version '>=x11-base/xorg-server-1.16'; then
-                       insinto /usr/share/X11/xorg.conf.d
-                       newins {,50-}nvidia-drm-outputclass.conf
-               fi
-
-               insinto /usr/share/glvnd/egl_vendor.d
-               doins ${NV_X11}/10_nvidia.json
-       fi
-
-       if use wayland; then
-               insinto /usr/share/egl/egl_external_platform.d
-               doins ${NV_X11}/10_nvidia_wayland.json
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-
-               insinto /etc/vulkan/icd.d
-               doins nvidia_icd.json
-
-               insinto /etc/vulkan/implicit_layer.d
-               doins nvidia_layers.json
-       fi
-
-       if use kernel_linux; then
-               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
-
-               doman nvidia-cuda-mps-control.1
-               doman nvidia-modprobe.1
-               doman nvidia-persistenced.1
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
-               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       DO_STRIP= \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       OUTPUTDIR=. \
-                       PREFIX=/usr \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/include/NVCtrl
-                       doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
-               fi
-
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-
-               insinto /etc/nvidia
-               newins \
-                       nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || \
-                       doicon ${NV_OBJ}/nvidia-settings.png
-
-               domenu "${FILESDIR}"/nvidia-settings.desktop
-
-               exeinto /etc/X11/xinit/xinitrc.d
-               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       systemd_dounit *.service
-       dobin nvidia-sleep.sh
-       exeinto $(systemd_get_utildir)/system-sleep
-       doexe nvidia
-
-       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"
-
-       # Documentation
-       if use kernel_FreeBSD; then
-               dodoc "${NV_DOC}/README"
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-       else
-               # Docs
-               newdoc "${NV_DOC}/README.txt" README
-               dodoc "${NV_DOC}/NVIDIA_Changelog"
-               doman "${NV_MAN}"/nvidia-smi.1
-               use X && doman "${NV_MAN}"/nvidia-xconfig.1
-               use tools && doman "${NV_MAN}"/nvidia-settings.1
-               doman "${NV_MAN}"/nvidia-cuda-mps-control.1
-       fi
-
-       readme.gentoo_create_doc
-
-       docinto html
-       dodoc -r ${NV_DOC}/html/*
-}
-
-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 use kernel_linux && 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-fbc.so.${NV_SOVER}"
-                       "libnvidia-glcore.so.${NV_SOVER}"
-                       "libnvidia-glsi.so.${NV_SOVER}"
-                       "libnvidia-glvkspirv.so.${NV_SOVER}"
-                       "libnvidia-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.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.1.4"
-                       )
-               fi
-
-               if use kernel_FreeBSD; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux; then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-ml.so.${NV_SOVER}"
-                               "libnvidia-tls.so.${NV_SOVER}"
-                       )
-               fi
-
-               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
-               then
-                       NV_GLX_LIBRARIES+=(
-                               "libnvidia-cbl.so.${NV_SOVER}"
-                               "libnvidia-ngx.so.${NV_SOVER}"
-                               "libnvidia-rtcore.so.${NV_SOVER}"
-                               "libnvoptix.so.${NV_SOVER}"
-                       )
-               fi
-
-               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-                       donvidia "${nv_libdir}"/${NV_LIB}
-               done
-       fi
-}
-
-pkg_preinst() {
-       if use driver && use kernel_linux; then
-               linux-mod_pkg_preinst
-
-               local videogroup="$(getent group video | cut -d ':' -f 3)"
-               if [ -z "${videogroup}" ]; then
-                       eerror "Failed to determine the video group gid"
-                       die "Failed to determine the video group gid"
-               else
-                       sed -i \
-                               -e "s:PACKAGE:${PF}:g" \
-                               -e "s:VIDEOGID:${videogroup}:" \
-                               "${D}"/etc/modprobe.d/nvidia.conf || die
-               fi
-       fi
-
-       # Clean the dynamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
-               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
-               rm -f "${ROOT}"/etc/env.d/09nvidia
-       fi
-}
-
-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
-               elog "You have elected 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 ! use tools; then
-               elog "USE=tools controls whether the nvidia-settings 
application"
-               elog "is installed. If you would like to use it, enable that"
-               elog "flag and re-emerge this ebuild. Optionally you can 
install"
-               elog "media-video/nvidia-settings"
-               elog
-       fi
-
-       elog "To enable nvidia sleep services under systemd, run these 
commands:"
-       elog "  systemctl enable nvidia-suspend.service"
-       elog "  systemctl enable nvidia-hibernate.service"
-       elog "  systemctl enable nvidia-resume.service"
-       elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
-       elog "suitable path in case the default of /tmp does not work for you"
-       elog "For more information see:"
-       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
-}