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

[Matt Turner]

commit:     4b39ac5d997c6201aa3f3441f3a3dab040b9c281
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 05:31:05 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 05:32:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b39ac5d

x11-drivers/nvidia-drivers: Fix libdir

Thanks to Ionen Wolkens for noticing the mistake.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=713546
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-drivers/nvidia-drivers/files/nvidia-390.conf                     | 2 +-
 ...ia-drivers-390.138-r2.ebuild => nvidia-drivers-390.138-r3.ebuild} | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-390.conf
index 81dbfc45786..55c7cc4a539 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-390.conf
+++ b/x11-drivers/nvidia-drivers/files/nvidia-390.conf
@@ -3,5 +3,5 @@ Section "OutputClass"
     MatchDriver "nvidia-drm"
     Driver "nvidia"
     Option "AllowEmptyInitialConfiguration"
-    ModulePath "/usr/lib/nvidia/xorg"
+    ModulePath "/usr/%LIBDIR%/nvidia/xorg"
 EndSection

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild
index 7505e7d936a..c5edfd1bb9a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138-r3.ebuild
@@ -176,6 +176,9 @@ src_prepare() {
 		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
+
+	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/nvidia-390.conf" \
+		> "${T}/nvidia-390.conf" || die
 }
 
 src_compile() {
@@ -345,7 +348,7 @@ src_install() {
 		doins nvidia_icd.json
 
 		insinto /etc/X11/xorg.conf.d
-		doins "${FILESDIR}"/nvidia-390.conf
+		doins ${T}/nvidia-390.conf
 	fi
 
 	if use kernel_linux; then