x11-drivers/nvidia-drivers: fix build with USE=-dkms (https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/nvidia-drivers?id=aefba1ed1e6cd2be0caa41abb600b0a492499424)

6 files changed, 15 insertions, 9 deletions

diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r11 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r11
index 7dc4bc80..baa9d95d 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r11
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r11
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=3
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=697863d60b2a71b9c65257e154aadd8a
+_md5_=030f55e2691c168f2c7896ff188ccfc0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3
index a16a2312..1e6e72a4 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=4
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=6bde69ef7596f95db75de569139f846f
+_md5_=935998fc2b03b373c3e65535eff4ff7a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r4 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r4
index f4803c0c..86c1c792 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r4
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r4
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=5
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/550.107.02/NVIDIA-Linux-x86_64-550.107.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.107.02.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=56a4e8cbccb531155d43b1aa02cb10e4
+_md5_=2f017fde8b2ac8a6a3b43daee6ac8cc6
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r11.ebuild
index 222f9a18..be15e1fb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r11.ebuild
@@ -312,8 +312,10 @@ documentation that is installed alongside this README."
 	# to ensure that the nouveau blacklist is applied
 	# https://github.com/dracut-ng/dracut-ng/issues/674
 	# https://bugs.gentoo.org/932781
-	echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
-		"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
+	if use dkms; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
+	fi
 }
 
 _dracut_initramfs_regen() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild
index 822d7180..db4c9dcb 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild
@@ -307,8 +307,10 @@ documentation that is installed alongside this README."
 	# to ensure that the nouveau blacklist is applied
 	# https://github.com/dracut-ng/dracut-ng/issues/674
 	# https://bugs.gentoo.org/932781
-	echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
-		"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
+	if use dkms; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
+	fi
 }
 
 _dracut_initramfs_regen() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild
index cb0a33e8..4d076225 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r4.ebuild
@@ -328,8 +328,10 @@ documentation that is installed alongside this README."
 	# to ensure that the nouveau blacklist is applied
 	# https://github.com/dracut-ng/dracut-ng/issues/674
 	# https://bugs.gentoo.org/932781
-	echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
-		"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
+	if use dkms; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
+	fi
 }
 
 _dracut_initramfs_regen() {