gentoo resync : 03.03.2021

4 files changed, 488 insertions, 19 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index e2f7dba7ebe6..7883d4978b35 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index e51553139ab2..331031a67e74 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -5,7 +5,6 @@ AUX nvidia-390.conf 199 BLAKE2B e7eabfb3a61cc0e95da78270964a6bb55ae71fdad81376d4
 AUX nvidia-430.conf 725 BLAKE2B 968f11d7954acf9f693ebfb811fa1fd8bd920720a9a00fe18d5170693c9e439bcb40921dbf7adf2a77a149170ce0973e26201ccef10efad4f2f47828c5c987d5 SHA512 04e1faa05208d565473ddb191ec13bc0c860ff3085e97b8032e1e8eb764c49aba608f4ca0ca1c6cfcb8be88657de5f683f77a12d9f85de075a7ce022b3d1ed20
 AUX nvidia-460.conf 723 BLAKE2B b5ce6a5766cfe821cbed24d12c514f2ca86a450d2e4a98022cbe6f31f67c1b7b503970c518cf62114f9428ffb20cbd7ecb0dd4aa308b6fdcd801c72824a915df SHA512 0d6da49e8bac452e7fa532a41c74f103edfe34df0fa4c70c503eea01af640bc5888b0b92f2fe4f39d43e47727552f0ac5d0a5657ac43467c555fcb49d7be7207
 AUX nvidia-drivers-440.26-locale.patch 299 BLAKE2B ad9065b968f1ad62c90e3aeddaa5af9fe007f89e5e80fc74f4c200c642b968196d8880511cc05d1f2fd04e5ab4f189cd2935eda993f9f174f0f0f4d58b7de711 SHA512 1723963b3e7562332909322ee28373dff83f253db4805d4c77c837abec04a73946afdd2837a699d0babd989090ddfcc33574993c2f8d3857eb24cf0e9ad4e6ce
-AUX nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch 723 BLAKE2B 687e93eb7f48028b6167ac930efd63b85bd35c16c62e5a6a0437b83b9e61b7b203ac41de48752811a8f5e9253e1a808c8b2fb4e7661f2c8682842e73710c9b57 SHA512 6ddca039f97af24e8c94dc300531e96329a97c0fe45505172c1993d59f38c4116822300e348b09ffd83f750cfefa8cf407aaaf8a99de8d53dab956c8d7accb60
 AUX nvidia-persistenced.conf 250 BLAKE2B 8b3514f981d992d34c949011a25fda5737d85ade831f15481843db14f67494e6f271eb7947a459a28c7991cdeb86092a2a7920e6f40213bcded90b7f9f15dae0 SHA512 9c9562bb15bf4552754dd50a1b01dec5df76f7f5666fba2fff642a169f87e9ed421a260f2258ab469f7e4cd9ef8161653355795624387fe7ad5ae6a0d71e5f46
 AUX nvidia-persistenced.init 650 BLAKE2B 3be9ea563ecb9741bad4de1516ab9cf373c5b412eea52cf4d8e6446ee09f6adee47bcd1f65217c7379b55d99de1966b2335ecdfa940f9c7544cd103992ba280f SHA512 864c90573a033e30d151c9adb9f0f12c5bcba2b5a7eaaa62f86fc11747f13956825fc5acb4fb1fb453a32acefe850e73264a650fafa6014cc96bbc7e3b56fdaa
 AUX nvidia-rmmod.conf 108 BLAKE2B 8a14963d7498c08f22c60f0e7286b66375c22e9db081454d973738bf847bfd4343c82f4e1c529ec6b904ae3e8cf29e2570dd4cf2fbb8c8aa9bd33491d2e4f543 SHA512 cb6b70ba0fc9c6d81d43f31d724538beff79e7e9b02c610485f1e46757d7bf16410d5cb2853d8d67ea6e4da59e7e1687ad14dc4b494415c6db6fab517a03b28b
@@ -21,10 +20,13 @@ DIST NVIDIA-Linux-x86-390.141.run 49589744 BLAKE2B 304672806b89885adbf8459ea99ca
 DIST NVIDIA-Linux-x86_64-390.141.run 85330901 BLAKE2B 7759d8cf6c9a75607b9a3ecd53cdd6f6a93f2f372d740a5a87d4d3f41a22f3bd953cc7dd6a0dc0e23a829ec86df8d65b9de499a76cfd4266a13b0aa3288aceb5 SHA512 5448d70e6e64a6403e61a004d83c69a442dd8ed0d61da3a31d3e3b7943c06c559a66b0f8d135982868ecbf209a965f60dae1a633367630b4d9287f725bbaa53c
 DIST NVIDIA-Linux-x86_64-450.102.04.run 141391114 BLAKE2B 019f928464b23d2a86bfdd255b7651e3cfe2b0b6ebf58d1b4a6ba1f27990e1d050d1e2429ba4aa60b966b04e775939084a04d82d1dd3482a10b39375b17b1c31 SHA512 1d13de540da36274a360ea6bcd1ce01eaae103fe417b42aa8f9ac757c382b06da455a78cf6798310179f90e2afeadf3a8c9f3398186490c3c0f9079021e850ed
 DIST NVIDIA-Linux-x86_64-460.39.run 178310565 BLAKE2B 65931f34ff47de02933797f60128c66c8774f3b217b79e82f781cd50560835ec79c37b7e63fb50231a22646f0cd7cf968d1fbe1ec6c2b3732a1c565b68de7bcb SHA512 9275a58ff0e72c3ee033bd18fa9e9dbb0203d2961a63e7cc04444889118eb4029c60bb10c2af8f230c1aa4aa30769131ea8c01f3bc4e7453336ad9c03ba23b42
+DIST NVIDIA-Linux-x86_64-460.56.run 178496173 BLAKE2B 8f84a403ccaa9a92186cac9fb2dee9600cd29915cdacf475b6a1105772ffd52c671ef217a1201fbcd9192e858ec17796fd77b817887c79c43c266d32671fe7d0 SHA512 a61855576a27cdd2e48906ecb49cd1e9f88d14a8358aa4bdc57d59e2dfa64b394b2dcee45184d75e889fac6ebedcaaff902a07428c7f9eb011cf265228c6eb4e
 DIST nvidia-settings-390.141.tar.bz2 1108755 BLAKE2B 210c33d4bb483dd9abe13275feb641a00d7c39a7222cbe828c925b9cfca6d4422f8fa3333dd77b73f2ba4071a7badf77625be88e02a1835177bda490c3c3c368 SHA512 44bf5f6b5bfbe3146f97d9ac82a75cc5653b6002002623ac6fa6cd233bbd3ef0d15f0b8091b59de5dbfdbde4fbe1b5212c9f9a1653ec98597c9049c9b137902e
 DIST nvidia-settings-450.102.04.tar.bz2 1057126 BLAKE2B 4e27ac75441d455122860b3834f2584e4736fff1f641e9a1d3ced4a354cb0e0e35c4e7a71e7bc05940d585e0ceca576f726fdfffbb84aae8057d06355b91293f SHA512 33f27b9a2832f7f24603d3a741b6c34cdd3f27a7075b523f8b98ae89325f810e13c134fcc7503e72d44a6f6c7a0d8587bfdad898a4ab5fa252bd9c7360a32341
 DIST nvidia-settings-460.39.tar.bz2 1060391 BLAKE2B badfe9e5fa3ca7f5389369b01f839aa37b687e99bac47663b320602ada4d4e8dfb7c6fa4f64cee358a25ced7d9393ddfa4242147d9b645ae4fbd1b68310f3363 SHA512 a5f01d2a627695932399804776923a90050ec66b19c9d95ed34d11fc79e41604fe25474ed7b7bfec68b2115dd6fccb444b66427ce78c1d67b1b01f072bc8892a
+DIST nvidia-settings-460.56.tar.bz2 1060604 BLAKE2B cd1480e42ab2b25b399f19b458a1d5252d1b77d263ddecbad2d61f0445ba9f0ddf81fc944ac1136c273dfd1d21d06385bcfac9bdd7a7dc02f75302a6b8276df4 SHA512 018eb3cb7f25b926aa620201979b0efaaa82e7f036c4870a1e1234f5aac3ab9cfd48846d7eedd7ed38c3035eface3f2afe1a0d5de7a67e53e6bea760aa99fa72
 EBUILD nvidia-drivers-390.141.ebuild 11741 BLAKE2B a8b6d64c68c56980d9084ae0efc1714595c0b25bb837136c7bec532e1a039bb6879d436fb7bca12590034b63e582435b921f017febece4308a387ba00caf49ee SHA512 1ec93229573d15474a14065e1b33a09a932428bb09a86e628488396270f7b0623674cfe6437dfd62ed35ca76ecefd0891ec3d5f5b231b013fa70b7967ac870aa
 EBUILD nvidia-drivers-450.102.04.ebuild 12181 BLAKE2B c4b10edd2bdf5042c4b45b604782e515330dda0143863559351f089ad33ed397fa918dd12b2b516847bf066a73e74e2ab068b3a1b247d798ecb91734bc0d33a4 SHA512 da3857f183185af4303cf26891f029b8906f80c5ec97b241ec397d97cde188dac3af1dcb1f11d443806b4abfca85bbb44012c36060f2d680b360e2d972df4967
 EBUILD nvidia-drivers-460.39-r1.ebuild 12179 BLAKE2B 58e1872093075700d88b6679eb4a1bb6c8368836c9214eded9e084a70c411a0fc245b176b1a97a983f1a85d29efc22cd8e89d04467665f31b1bf5d3dfbff1041 SHA512 71a904989afd4b82e36356e0842c2ca67dbb8efae186b7074a3a6d20c9572f6911681f3ca89ab2a179d4f0699256c2228e40a5d3094ef98cd9704c47aefcd138
+EBUILD nvidia-drivers-460.56.ebuild 12180 BLAKE2B 44da00ff67edfee139d1ea40eb6c5db417daf299d7280bdfc5d7a318f9d29d1553b3490814e98042f92338bf008656a1dff7667def2eef127caf379acac28268 SHA512 cab248b945b07096a35d6f6f77df191d7bc4b3660d754fd5e43882dc11d0fe7f4048395994a10189ab70895af64a27fd8a116fa5d6feff7012f6353279bc1672
 MISC metadata.xml 1167 BLAKE2B ad7345cdf317a41ad31112cbaa6c5cb4c9eecc383b42d56616bac7c0a784a29c39978b42345dc7323699d4d3b8b610a716b32097ae780fa6b238a3b8f5f2d646 SHA512 f67f0b1568f61567f05e9c2bffee173000e9a8c8a0c4c03b8f83f0a75cc1eb5608073b2850b8aca53fd0b3e970895391bfc901f938a6d6f2c2c8ea4e667587c4
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch
deleted file mode 100644
index c61033bf2a92..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-455.45.01-reduce-kmalloc-limit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch taken from
-  https://forums.developer.nvidia.com/t/455-23-04-page-allocation-failure-in-kernel-module-at-random-points/155250/55
-Bug: https://bugs.gentoo.org/755497
-Credits go to Gregory Beauregard for pointing this out
-
---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c
-+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c
-@@ -282,8 +282,8 @@
-  * are called while nvkms_lock is held.
-  *************************************************************************/
- 
--/* Don't use kmalloc for allocations larger than 128k */
--#define KMALLOC_LIMIT (128 * 1024)
-+/* Don't use kmalloc for allocations larger than one page */
-+#define KMALLOC_LIMIT PAGE_SIZE
- 
- void* NVKMS_API_CALL nvkms_alloc(size_t size, NvBool zero)
- {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild
new file mode 100644
index 000000000000..8f678c958a97
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.56.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2021 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 systemd toolchain-funcs unpacker udev
+
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM64_NV_PACKAGE="NVIDIA-Linux-aarch64-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	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"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%%.*}"
+# TODO: for arm64, keyword virtual/opencl on arm64
+KEYWORDS="-* ~amd64"
+IUSE="compat +driver +kms multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )"
+
+COMMON="
+	driver? ( acct-group/video )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		app-misc/pax-utils
+		media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${COMMON}
+	virtual/linux-sources
+	tools? ( sys-apps/dbus )"
+RDEPEND="
+	${COMMON}
+	net-libs/libtirpc
+	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}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)"
+
+QA_PREBUILT="opt/* usr/lib*"
+S="${WORKDIR}"
+NV_KV_MAX_PLUS="5.12"
+CONFIG_CHECK="
+	!DEBUG_MUTEXES
+	~!I2C_NVIDIA_GPU
+	~!LOCKDEP
+	~DRM
+	~DRM_KMS_HELPER
+	~SYSVIPC"
+
+PATCHES=( "${FILESDIR}"/${PN}-440.26-locale.patch )
+
+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; 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
+}
+
+src_prepare() {
+	gunzip *1.gz || die
+
+	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
+
+		# remove GTK2 support entirely (#592730)
+		sed -i \
+			-e '/^GTK2LIB = /d;/INSTALL.*GTK2LIB/,+1d' \
+			nvidia-settings-${PV}/src/Makefile || die
+	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_configure() {
+	tc-export AR CC LD OBJCOPY
+	default
+}
+
+src_compile() {
+	pushd kernel >/dev/null || die
+	if use driver; then
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	fi
+	popd >/dev/null || die
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/libXNVCtrl \
+			DO_STRIP= \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			RANLIB="$(tc-getRANLIB)"
+
+		emake -C nvidia-settings-${PV}/src \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			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 [[ -n ${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 [[ -n ${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; 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-460.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
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia libnvidia-cfg.so.${PV}
+
+	# NVIDIA framebuffer capture library
+	donvidia libnvidia-fbc.so.${PV}
+
+	# NVIDIA video encode/decode <-> CUDA
+	donvidia libnvcuvid.so.${PV}
+	donvidia libnvidia-encode.so.${PV}
+
+	if use X; then
+		# Xorg DDX driver
+		exeinto /usr/$(get_libdir)/xorg/modules/drivers
+		doexe nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia libglxserver_nvidia.so.${PV} \
+			/usr/$(get_libdir)/xorg/modules/extensions
+
+		# Xorg nvidia.conf
+		insinto /usr/share/X11/xorg.conf.d
+		newins {,50-}nvidia-drm-outputclass.conf
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins 10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins 10_nvidia_wayland.json
+	fi
+
+	insinto /etc/vulkan/icd.d
+	doins nvidia_icd.json
+
+	insinto /etc/vulkan/implicit_layer.d
+	doins nvidia_layers.json
+
+	# OpenCL ICD for NVIDIA
+	insinto /etc/OpenCL/vendors
+	doins nvidia.icd
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	use X && doexe nvidia-xconfig
+
+	doexe nvidia-cuda-mps-control
+	doexe nvidia-cuda-mps-server
+	doexe nvidia-debugdump
+	doexe nvidia-persistenced
+	doexe nvidia-smi
+
+	# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+	doexe nvidia-modprobe
+	fowners root:video /opt/bin/nvidia-modprobe
+	fperms 4710 /opt/bin/nvidia-modprobe
+	dosym ../../opt/bin/nvidia-modprobe /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
+
+	if use tools; then
+		emake -C nvidia-settings-${PV}/src/ \
+			DESTDIR="${ED}" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=1 \
+			LIBDIR="${ED}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			OUTPUTDIR=. \
+			PREFIX=/usr \
+			install
+
+		if use static-libs; then
+			dolib.a nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins 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
+
+		doicon 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 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 $(multilib_get_enabled_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
+	newdoc README.txt README
+	dodoc NVIDIA_Changelog
+	doman nvidia-smi.1
+	use X && doman nvidia-xconfig.1
+	use tools && doman nvidia-settings.1
+	doman nvidia-cuda-mps-control.1
+
+	readme.gentoo_create_doc
+
+	dodoc -r supported-gpus
+
+	docinto html
+	dodoc -r html/.
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${S}"
+
+	if has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${S}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${PV} ${GL_ROOT}"
+			"libGLX_nvidia.so.${PV} ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libcuda.so.${PV}"
+			"libnvcuvid.so.${PV}"
+			"libnvidia-compiler.so.${PV}"
+			"libnvidia-eglcore.so.${PV}"
+			"libnvidia-encode.so.${PV}"
+			"libnvidia-fbc.so.${PV}"
+			"libnvidia-glcore.so.${PV}"
+			"libnvidia-glsi.so.${PV}"
+			"libnvidia-glvkspirv.so.${PV}"
+			"libnvidia-ifr.so.${PV}"
+			"libnvidia-opencl.so.${PV}"
+			"libnvidia-ptxjitcompiler.so.${PV}"
+			"libvdpau_nvidia.so.${PV}"
+		)
+
+		if use wayland && [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.1.5"
+			)
+		fi
+
+		NV_GLX_LIBRARIES+=(
+			"libnvidia-ml.so.${PV}"
+			"libnvidia-tls.so.${PV}"
+		)
+
+		if [[ ${ABI} == "amd64" ]]; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${PV}"
+				"libnvidia-ngx.so.${PV}"
+				"libnvidia-rtcore.so.${PV}"
+				"libnvoptix.so.${PV}"
+			)
+		fi
+
+		local nv_lib
+		for nv_lib in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${nv_lib}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver; 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}:" \
+				"${ED}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	rm -rf "${EROOT}"/usr/lib/opengl/nvidia/* || die
+	# Make sure we nuke the old nvidia-glx's env.d file
+	rm -f "${EROOT}"/etc/env.d/09nvidia || die
+}
+
+pkg_postinst() {
+	use driver && linux-mod_pkg_postinst
+
+	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 "${EROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_postrm() {
+	use driver && linux-mod_pkg_postrm
+}