gentoo auto-resync : 01:10:2024 - 01:26:02

10 files changed, 64 insertions, 56 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index e5326073b100..b0bf0ff334e8 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 44e7d79a7f79..8a65243f227d 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -78,12 +78,12 @@ DIST nvidia-xconfig-550.107.02.tar.bz2 111170 BLAKE2B dbf2b0b7f7b71f17ce5a0b6ae1
 DIST nvidia-xconfig-550.120.tar.bz2 111154 BLAKE2B bbb60c07497786c9947f418f2fa3e11244a53e38478db62bed4d3ccb1af8c5fd209710760df9bb727685b2f95618f91ce93b03f71aaa2e81b0001ca840e87937 SHA512 c286cf5f8fcc0eee25ca0459212b04292adda356b3ee3f0ed4c7d1aef0c859e5cd2498f7010950fb3834726f13a58ea19b84934635a0045e2a2cf843197a2d86
 DIST nvidia-xconfig-560.35.03.tar.bz2 111203 BLAKE2B 347d4f80b9a16da54fbd7116d0ceafbb15b3b6e78aa1640b8505674b9ffc32056197925b67506d2cbb5d130054944c13246a592d9021f0bb2410ee6e8216df4e SHA512 1a68729b8aa1d3518b43392d4f9af163e2a084c635c08343b25ce761f835801aad203778fd03564ba050ad949a9d2df84fba4c8a48bb1a7afea5e72eb364eb58
 DIST open-gpu-kernel-modules-550.40.75.tar.gz 13813169 BLAKE2B 6033b8faa985a3f82c9ea7c79e54bc6d14c8c493a59db509f8fab59f2c58f8a44c264ba57f482893f5eb4473a9e06bf964f0a6410de062991df6f42fa094186e SHA512 ca7de8249457c6910f9b95b535c76127fad4c2b7e2648b7705cee04b2e0d3319f4365cedfc0f87b603bb1b50b48c63cd0580bb8f434630919511d4b5b22c01ca
-EBUILD nvidia-drivers-390.157.ebuild 15136 BLAKE2B 6ef5e51472ecc63dec8bd6bcd452829925f9877c631a2e08fbbdf02e082b3d6030dbe11f8eee48259ba10912692dc43582540284c65312560a7552be2e1d4664 SHA512 b6655ce0fe1c36e0cabfc5b8fa82ea0435090703b9bdc20a0abdcb8fbaf0f39affd38684d58c13ec4b8e8e704063fab52d57d838f09a56a08e3a7de14ff793a1
-EBUILD nvidia-drivers-470.256.02-r1.ebuild 17683 BLAKE2B b99e6fa06b692100321d38ec9d1207d14e2818d7977ee75424ed038191ca582f074af584a0373fe552a7382e664f74a38d3eb7aae360b32843c4d99d0f970e27 SHA512 c1ab9067dea4303cdbbe4fdc58e7e024449df41145208440d54af11bf7fc889075d85b6865616ee78308fa7c1d63ded9382021805a58b2f0cf92c4dd431cf1cc
-EBUILD nvidia-drivers-525.147.05-r1.ebuild 20997 BLAKE2B d7e0f34b40c029b64640a508b75620e62208f356979b99943b7d22895d0c432cb234214085fbdf4a00f7a31f68ae60d87f695b52efc373f79487bbfce04873ec SHA512 a2b4802077d61be25885d1f809ffe443927398656e1326725916c9977f49a3492610b9fe57dc9c5cdcf088eacc7557a4f3dab45a1e7673d6bbe32eb05cccc54c
-EBUILD nvidia-drivers-535.183.01-r1.ebuild 20847 BLAKE2B 3bb33cb7e134c89efb77ea2b5eb03f9169c73b09472c8691770fabd05e9135c6c5715aa53c02734ee3546427497856d5e5f5962529aaeae04e40a895bc25e4d6 SHA512 ac07d896a40159e7ef8df9d164052201043f6ba146ae1c19e6d8b7c964e3e867bd829fab99dfa7f889ed22cc4c5f8a4ca2b0fed2cf69e466613a4e940f61cf0d
-EBUILD nvidia-drivers-550.107.02-r1.ebuild 20526 BLAKE2B 32f04d6cd902845e6b8243ee52584a6b7cb0b0b850258b3c7ccbd0f786f7b1ba875742aa43967207cb245c874e94740f9b781fbd2940648dce9c3ffc8274bb68 SHA512 23d90e42b52ffdd66a001e5d64292cb72717fe292524328320477bbf13864dd6be1ba6345ed6b91ceb934208924e251c27f93766a229874d4b2368ab344d4002
-EBUILD nvidia-drivers-550.120.ebuild 20462 BLAKE2B 6b66c77de9020dbe9e064b8f52dba8c435f502fe692fffc96cf3952c4c61e601fe1f0d8adfef97a11fadaf0d30c34e664a06e593a4ef082908b4e0409772f57d SHA512 3599be6db3efcbadaf9c5df25a37b669fcac88630f47b211c803a265cf4b6c34527ccaa31f60b6a1f79671e90531a6d307b6f0c21843b1c2e6c976735664dda5
-EBUILD nvidia-drivers-550.40.75.ebuild 20575 BLAKE2B a5464df047dbd9cd9a32705aeb7046df9a980012b4ae6acb1149ee5506f0b8ba8d2a838a514aa8fdd8d8d3056e19287df9ffbd40cd6fc1c09f1b12ee2da3463d SHA512 3dcc98febcfe70f3c61761e83a7b9e21ad10060bf39376f8489fcc02a9898680db546f7e5a2559c4f9b7a3835ace6b4b644af84f06bff6bc23a82df60b566e24
-EBUILD nvidia-drivers-560.35.03-r1.ebuild 21286 BLAKE2B 43107d56e92c9df707d05ad3dd4bd68415abfff9af49ded939389eeb0b061926c9898dc5198874f709a1cdf825d4020c8d3765f983ff8eb76a0cfdeb75da67a3 SHA512 4d5c1beebb2a8feecfe5b286c46bc7232456795c42202bd1f90a07cb32673932454b78ae9418e9a3eedbb677ac2b7188d55bbea1de5c7f67d82d3eb7b6c23754
+EBUILD nvidia-drivers-390.157.ebuild 15175 BLAKE2B a855dbd05e8bf20e28359da458d99109a17c7aa7b1addedaaa417e4f7c8c267feed00aa6600c2b4f6de9b338dbb7d7c83431e4854fd722d38c13a6ee9d66eced SHA512 9a0c6f986f2dae437203b062f44306dca9487708331a80c45d96f3fbd6063ed1b62734aaf6322c7bec982b658db43d223e033c126f99150c334b0a6e64691470
+EBUILD nvidia-drivers-470.256.02-r1.ebuild 17722 BLAKE2B 29b12146174adeea07ca535f05d7c7e305f79db7d59ebcf6f416f8d721ee054936e240c328e2c8cc84b4d03937e7323dc2b92426093a851d2a5f3c5b08d567c2 SHA512 c6a0f9f7146f0589df8fe621f7dc52d18f0ac9c51d0f394abaa52b9ac1ea04a90e0ef00e8592868c5726c44e6982c75a037c4e17097351c09d53bc628776aa41
+EBUILD nvidia-drivers-525.147.05-r1.ebuild 21036 BLAKE2B 4311fc79acf9b7fae1e5e02f138799946ee980cf58156b0ab0f33ef2af67cd7fada4e7ac21c0dc300081416ffd3fcac46168d03fab9671a26ade3fcbd70a41dd SHA512 61246e7b6405e6d5e34a4d33d24143b858353b232082b5f8af191d50436786e0e14362fb354b944e924c7c512bf788c0fe3a2589f5cb40648b831e85730af220
+EBUILD nvidia-drivers-535.183.01-r1.ebuild 20886 BLAKE2B ff23a61472f9f4efa587fae1cca48b84a55bee50e8311ca64daf4b1f40ac014d15ad46a8859bf73fa0b5eb70d73c22f1f158f352baf0a8854aa5b880bd06acc1 SHA512 aacb4f7cd4134ab7bcc99a349cdd7e3716edbec4fdd0d5c0787cb430b62c83c77701af0b0e7ac9e5723dd8fbd578621746bae66db9e4e09497b3519a9bc5db76
+EBUILD nvidia-drivers-550.107.02-r1.ebuild 20565 BLAKE2B cadd2ae704a5c5c0ec75a95441fef28bca6207eaba0bfb8326f5491fee534f57c843a0b8ea45ae058fe85dc9c69a1cd95cee5a88e9e2d05d364c1de872fb6ee9 SHA512 4f598169f1fce4efa45d5e46b1c7fb4e95e82373f1d9a48939aede57506a43a5f2c3780b34ea3d0ebf138de41e099e3efde0a67fd870397374cc9faa94923ebf
+EBUILD nvidia-drivers-550.120.ebuild 20501 BLAKE2B 351ed8d2e22fa48773a0b43f63ec6c0abb0d33d55f866611a8bf3e5155135adb54fe91c29553787473f43a76f5c1365686266c50a8414e5f896df77d3666b22a SHA512 fc6359dfdebd29bc818e98a7d21a7438b123afd6220ec4a1e91f5b6fa6586ce442df5f9d3899f997ffa3b8fad33f232ff8b9932940dc829b2659457d8beb4bb5
+EBUILD nvidia-drivers-550.40.75.ebuild 20614 BLAKE2B 09cfbb1a9e36660d2a442bbfaff8bac77512df79b4bc4b7b6668c741f7e45861886e26457db0237217e8e918a21488d4b99b5403855fd0a52878ef99aec9dbf8 SHA512 13efc668c85aa1e2c6da566bf3eb7b127b9c979294d96f1be30324712aca7710bcdef68f1d4c64d626efca05fd403c6dc7ff22849011d62f6ab1bb495efeac85
+EBUILD nvidia-drivers-560.35.03-r1.ebuild 21325 BLAKE2B efbcd065b75a23489d36cb4448923bc519ebbc024d37eacc86cdad45534b7dd879ced5c491cf6c0d466a2506f1b8f101b357839e8835078f20f8a81f04e3b4d2 SHA512 b3e3fe5963526614ebd6aecf69d359294f1c8a4342ead14b80df315e3d046dd3837c2132e2d32fd2eec1d9224e5cfb6ad72e696c668f74e05c27aa86e6878033
 MISC metadata.xml 1457 BLAKE2B 10fccbffe28ab58e012aae439123f947acea95eb3bdc4d0e2eb1ec14a92ad24fc2e3e0c248dcce87d9fdec54a65b8e040b2ed048d9ef11054f762f295c24ce39 SHA512 8469884c614a0275f438a0f8d583f2823d1159905ee27402e859c824cc458ac31daf69f2b7960533daaf86e1ca203be745c03e4e67ff12e9bbb2c08b91c667a0
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
index 9de2db703e7e..eb7f7c538b20 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild
@@ -401,12 +401,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
index 901fcedc63b3..2d1290262b0b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild
@@ -388,12 +388,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild
index e799f517bebc..16f64f83801f 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild
@@ -452,12 +452,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild
index d547a90fb2f7..895d1216ea02 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild
@@ -452,12 +452,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
index 7b1df6278314..d38e79b6dd1a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild
@@ -443,12 +443,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild
index 3f80d1a64cc2..09d99013c890 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild
@@ -442,12 +442,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild
index 7c967cc422fc..3d6eb1baaf8d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild
@@ -445,12 +445,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
index 2027543207fe..f348c8169992 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild
@@ -448,12 +448,13 @@ documentation that is installed alongside this README."
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
 
-	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
-	# 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
+	# dracut does not use /etc/modprobe.d if hostonly=no, but want to make sure
+	# our settings are used for bug 932781#c8 and nouveau blacklist if either
+	# modules are included (however, just best-effort without initramfs regen)
+	if use modules; then
+		echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+			"${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die
+	fi
 }
 
 pkg_preinst() {