commit:     418d6d42276aa1865217dcba35b1a21ff86c2c51
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 06:12:54 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 06:14:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418d6d42

x11-drivers/nvidia-drivers: Version 435.21

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Bug: https://bugs.gentoo.org/692170
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 profiles/base/package.use.mask                     |   3 +
 x11-drivers/nvidia-drivers/Manifest                |   3 +
 x11-drivers/nvidia-drivers/metadata.xml            |   3 +-
 .../nvidia-drivers/nvidia-drivers-435.21.ebuild    | 603 +++++++++++++++++++++
 4 files changed, 611 insertions(+), 1 deletion(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index cdb369d6e79..dec89386d6a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -127,7 +127,10 @@ app-admin/conserver freeipmi
 
 # Matt Turner <matts...@gentoo.org> (2019-03-03)
 # Mask for testing. Bug 606924
+# Jeroen Roovers <j...@gentoo.org> (2019-09-02)
+# Bug 692170
 media-libs/mesa libglvnd
+x11-drivers/nvidia-drivers libglvnd
 
 # Georgy Yakovlev <gyakov...@gentoo.org> (2019-01-17)
 # Mask openjdk:8 for use as system java-vm until it's proven to work

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index 5fd9b028c81..cfea009f52d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,6 +7,7 @@ DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 
39ac5970ef1a6ffbb03abe
 DIST NVIDIA-FreeBSD-x86_64-418.88.tar.gz 62076023 BLAKE2B 
10f9fc4073c926d170a57e165454171c31624824d44a67f78bad68843b87f965361db509a5b86989a1224a347ca0550015ffd8e137ad17974708e802604b397b
 SHA512 
d3a0f029f3d8c78a7419dbf7fd3af1b22ab01cf8d6d770572e44f2b61635e05f17d3262b611a7760b66bdc3ad4283a558c393f0f8c0e64d87eacbc929bb657bc
 DIST NVIDIA-FreeBSD-x86_64-430.40.tar.gz 62712042 BLAKE2B 
6791f5931c715888dc76a0e4d2d28deecce24fc7ab989eba6def0369c3f30ccb680dbc792a0a9c3df9194c21286612c9a02f3130e0db53e06a2071f7b3662097
 SHA512 
a8fd481bafaff2a5aa68a4b1bc57bed80eb794c2d2a35d26546e113610276d0aec79116fb31bd34283da9fae559eef6357e5639baf8a5ced63eb8af6c26fc7bc
 DIST NVIDIA-FreeBSD-x86_64-435.17.tar.gz 64151018 BLAKE2B 
22e18998d2b169de759e8f2951f6ffd4bfea643985d45895b267d1a36e211565b30d3937f75c17fe9a0cc3368902b9968eb817767053e691a15eaecc6b5d7412
 SHA512 
203727be00e8dd2a3df140058c111527bcb2b2689559cccbfd4557b45f832898cd89f04fda810262d4d91a8629c4c85b3a360f10b77a57dbf5c123549a5da0c0
+DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B 
fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1
 SHA512 
2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.129.run 29102893 BLAKE2B 
19f73b7ac4df7d0584f180492676eba65a42c527566175308ebb78bd10e0a43c3f300f013193cafc9eccf1cb32a58f8d6dc574073d4197d2d71d90f224e6a5c4
 SHA512 
9e7a10e0bbd856a7a630fb8d1660a3e5cd224a04243989dbd24f3cc2e869a817a1fabe98b4257e9e5870a96f8d6dbcf51312c960a4a185457cb011ac9a0246fc
 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 
2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8
 SHA512 
0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338
 DIST NVIDIA-Linux-x86-390.129.run 47560033 BLAKE2B 
e9b34c51d63dada2714c74cdb4ab199a141b1f5dd9f0d3222b1f5eec6a6a07dd2fdc2a609b9d0683b99c26078f4426082ea25b663c47f33fff4bb84599ac41e2
 SHA512 
b31d8f6b663fa7da1291fc25b4b08e17019476da521baea41201410a1d8a803b8ac9bad18485ff53589cea281ae4ece749118fa23a63e2c0720aafc60367255f
@@ -17,6 +18,7 @@ DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 
05fb81a4ab8626d0170a30b70e
 DIST NVIDIA-Linux-x86_64-418.88.run 109217245 BLAKE2B 
fd7e4aee2306cda92e99a3adeb74ada4ac64f81f0ffbc72bac6eb5f0f9815e4f71452e7fdbf49c749b0a7dd0e147e12c44282c2d8be6747b8504b1621b982844
 SHA512 
c4ee1eae30e8158007c3bbcff941bc8ee0bef9bba216b8a57c42305bc338d2d98d5fc56ec90b0809216a7eba8d7a67fe5be298943f2688daccf5c78efc0dd119
 DIST NVIDIA-Linux-x86_64-430.40.run 111258448 BLAKE2B 
9782181d5044430b374305fc868dd753d0f27c3b2f1f6b4bd34b3a49226730c4cf34b1ea4f3ba2c4fce5739c0408c64cc79f1a2c5a312ff3e09a5d20a79ce625
 SHA512 
68e6187fe74b43e92de6159589463db5f74eba09652b0f55d5fcc790c315405df6cd27129185f4dbe18790abdbb61e79b52977d47c6407e74d3372b5511a4e1b
 DIST NVIDIA-Linux-x86_64-435.17.run 142539690 BLAKE2B 
0e196128496fce634dfe8eceb873af5beebe1ac6c1c040c449e24bf00336b16716d065b622ab2a0f26c41c570db156afd5f3b36f2145d96988e9dff1e2a6dff6
 SHA512 
28f1d82f00d4c46431ec8ce6e2357b94c2eb68516e650ca941ab04e202b0aa15ee6573eb692b43a3eff6afc974a5702b2873a864c43b9f2b0e5b2feb8fe00923
+DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B 
e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c
 SHA512 
e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 
127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96
 SHA512 
593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-390.129.tar.bz2 1109456 BLAKE2B 
cdce0bba52697e214ea26514467ea6f61fa06429f0a58ca549b74d8da1f7b07cbc52b1c9de6a13aed77545c2ba8c98b212a7865fdc5026dcd74f5565b73c4e1e
 SHA512 
bf004608fbee6a12521fbcd9ab4e3d0333896b320c943ed9f2dc5373d8ffb2eb9cb4c6873a263acac87a9ab67a5f4589344d2bbd70bce36cf14242f4d57e1b87
 DIST nvidia-settings-410.104.tar.bz2 1120639 BLAKE2B 
75554b0cca7c022a0f1cc02091f81ccd930e30e1dd5f674cf35b0cfed83c5e235c360b0f28701d39d42017b35b816f975ff177398eb9f59280851c0b8bfd57d3
 SHA512 
08d938117fca4d471bdff451219e6772fdd1e9c37c0ed623be8506c1cb5ce7ccde4d073848ade9f5bfca14b1a3cf9eb90b4b4bf44375bff43d023815b622b424
@@ -24,3 +26,4 @@ DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 
36513252ff3d5f2036c80250e012
 DIST nvidia-settings-418.88.tar.bz2 1127894 BLAKE2B 
04b7c888e006f49e1745ede6eb8db35563c248b3c6be0c15539af1f9224c13ac7273037827e20294b03db0d5a56a62da8544ec605c40fcc0a2a15c741d76af9d
 SHA512 
fbd46aaf41da4f04e8cdb3c484c9170633921673adfc878588f1e5464cc690b8a9fcb37b3c3cb8f0fdb496ed1abafcf0694039543c1354f7b481a46418309099
 DIST nvidia-settings-430.40.tar.bz2 1131627 BLAKE2B 
da55a08d3a4d096afe5aec5fc7faf36b10d814cf135a444f06a115b225d94fe20046a266e6afee3660b588561c4fadb1581e6f9ab9196fe19eb171140f05ba9c
 SHA512 
9273887c2487476fc004839320b66726a766b0378dfd81d030386918d67e6a25ec6b26bed1db5c07634347e8cd6782f826c75e9ba8977b06e37880e4b55a1b9f
 DIST nvidia-settings-435.17.tar.bz2 1131069 BLAKE2B 
9c0b13b5a023b819a4ce88cb238efe8b5b6eb7a7b72d0affe947e84629b55e42ee1f6eddb2c874fb2856918fe7bfb9ea2e844ffdfd6bc298d95ba23ca8b86947
 SHA512 
30e683f0ad0b663946cdc5bd8aa9eb4e52774f378e1499536b0f7e37c32960ba2a6901cd4dec3eb0ffd874cf0225c5e95f4d69e78ca99d44a93a2de054251344
+DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 
855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24
 SHA512 
8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb

diff --git a/x11-drivers/nvidia-drivers/metadata.xml 
b/x11-drivers/nvidia-drivers/metadata.xml
index dea17321a16..4bdb2f83abc 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -14,11 +14,12 @@ You can use http://www.nvidia.com/Download/Find.aspx to 
figure out which branch
 best matches your hardware.
 </longdescription>
 <use>
+<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and 
VDPAU libraries</flag>
 <flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
 <flag name="driver">Install the kernel driver module</flag>
-<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and 
VDPAU libraries</flag>
 <flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
 <flag name="kms">Enable support for kernel mode setting (KMS)</flag>
+<flag name="libglvnd">Use <pkg>media-libs/libglvnd</pkg> for dispatch</flag>
 <flag name="tools">Install additional tools such as nvidia-settings</flag>
 <flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for 
sharing memory between CPU and GPU in CUDA programs</flag>
 </use>

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
new file mode 100644
index 00000000000..328511e0cf6
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21.ebuild
@@ -0,0 +1,603 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal 
nvidia-driver \
+       portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/";
+
+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
+       )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~amd64-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms libglvnd 
multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+       tools? ( X )
+       static-libs? ( tools )
+"
+RESTRICT="test"
+
+COMMON="
+       app-eselect/eselect-opencl
+       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}
+       acpi? ( sys-power/acpid )
+       tools? ( !media-video/nvidia-settings )
+       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}/
+
+nvidia_drivers_versions_check() {
+       if use amd64 && has_multilib_profile && \
+               [ "${DEFAULT_ABI}" != "amd64" ]; then
+               eerror "This ebuild doesn't currently support changing your 
default ABI"
+               die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+       fi
+
+       if use kernel_linux && kernel_is ge 5 3; then
+               ewarn "Gentoo supports kernels which are supported by NVIDIA"
+               ewarn "which are limited to the following kernels:"
+               ewarn "<sys-kernel/gentoo-sources-5.3"
+               ewarn "<sys-kernel/vanilla-sources-5.3"
+               ewarn ""
+               ewarn "You are free to utilize epatch_user to provide whatever"
+               ewarn "support you feel is appropriate, but will not receive"
+               ewarn "support as a result of those changes."
+               ewarn ""
+               ewarn "Do not file a bug report about this."
+               ewarn ""
+       fi
+
+       # Since Nvidia ships many different series of drivers, we need to give 
the user
+       # some kind of guidance as to what version they should install. This 
tries
+       # to point the user in the right direction but can't be perfect. check
+       # nvidia-driver.eclass
+       nvidia-driver-check-warning
+
+       # Kernel features/options to check for
+       CONFIG_CHECK="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC 
~ZONE_DMA"
+
+       # Now do the above checks
+       use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+       nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+       nvidia_drivers_versions_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
+
+       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} \
+                       || die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+       fi
+
+       dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+               || die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+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-169.07 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
+
+       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="$(egetent 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
+       "${ROOT}"/usr/bin/eselect opencl 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
+}
+
+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
+}

Reply via email to