gentoo resync : 16.04.2022

5 files changed, 24 insertions, 20 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 45c797539d3a..4fdcecc09ea8 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -30,8 +30,8 @@ DIST nvidia-settings-510.60.02.tar.gz 1247321 BLAKE2B 0d52a730bc50db58aaf2df435b
 DIST nvidia-xconfig-390.147.tar.bz2 107426 BLAKE2B c7004dab351581176a4e00fc099a12374cb29f3306769724c874a17600d6c11e79ac807fe218022d72ccf83ed33789d2378b0cdba35e5f94458e30631d725384 SHA512 a530c649ff7e75706ba37072ee58d64d4758348a45b953396a0e9d2608e1d7c3d299298cb50b1e8ee0bf2f6f8817bca64637b77e18aab0685a4edd630f18fb9a
 DIST nvidia-xconfig-470.103.01.tar.bz2 108687 BLAKE2B 2e5de637f9ba7bb516fd1a6801f8ee5be2934f99503bd20a62eaf87c0105d7624ef8de993614b1316ea8d203f9b7a6be07d3c9d5005d8a6306b7fc89cc0bb443 SHA512 abbabb3bf650395237759cbfaa39565893156ae87d07855bc96bfa0f46e10f34fd9efb628ef184f4dd525f80c63c62938b9661c9a4f3f5e1e5420ae1fdf26f0e
 DIST nvidia-xconfig-510.60.02.tar.gz 144024 BLAKE2B ce0b858bb41db589d04dd5bc19f0bd83a35e337fa00834b04cc215497dd1ca9906b3277378be51d6c124ff1b2574e0a3d5163d41e6c8e4f2b06f71ee15aeeb88 SHA512 77eeb06639d903f91d256ed2955ee813a8f70aa3336b98c9f1d7258523f2dc806c81ba5e26325f799722adcf8993f947113381bea40ee94d9f342475390eb3d7
-EBUILD nvidia-drivers-390.147.ebuild 13645 BLAKE2B 4fa43339a057c84434f28d49999c4666401ae2a0b4ef10e9917601a93da82d471792ad17c6c29253a63ebcdfb287521e466211c0db744a76dd48eae4062de889 SHA512 f7dfcbb83d86ed3e05aeac131b0617a3f67493fa2b5789ff7a23fa6c66b5adfb5dbfa64fd9ee385b77fbb81ff1e05e0c750d8c5c362e2e67d74698de83adccc3
-EBUILD nvidia-drivers-470.103.01.ebuild 14206 BLAKE2B 3e24ba36a72c36c4e33560e2901a965027d326082f82db0611d494e46ac36f0db1fd99a3fb758a4e8e8cd5c58be73f38bceb6ef5a2222cf7d85758fe65e36216 SHA512 5119e2661055e7b07b78a4eaa95d55b026e33e4c9577307c0e1da1620b1cd1a72faf30bab7df5e0f873e72254ea54bd793a1e0f9559c7bb05d4eed042628ea3d
-EBUILD nvidia-drivers-470.62.26.ebuild 14239 BLAKE2B 3ba9eb4114301a2ecd6e9569e7ca5e6aaef682dde4d3afb36ca601dec84f67b1e13fa3344d35a3eb0d9127b229f21eee30f5dad9c944cd9368646334d309ae59 SHA512 d77cc23914644c63bee985a9deb9f1b308d284fd545e5df191a8cb5a9d11ee16b3efdb309d659b64dc41bb07e7cd0af7554d749440c3fb68250cb2a8d012dcaf
-EBUILD nvidia-drivers-510.60.02.ebuild 14694 BLAKE2B 37d3ba9eab15fa3b1a7802cf09fbfc0a1f894e44c80fa6dbda5f99bc00951db0dec4a8f704b9291caaddd3551e80db1eba4aa04599e0898589f1b5fdbefe19ab SHA512 c368c11032a52eb1693c291fb2d238d24500cb86d5eafbd38e3434a0663e3e45388755a4244e7b2fad0c350c0b51e64ba5997ed8c54e93420da51d9d8bbb0646
+EBUILD nvidia-drivers-390.147.ebuild 13733 BLAKE2B d80e2ffcb4df114f1ef73d0c534bc866ba43a02dad5511937cc513aea763e54d4a91289a4def2b845eada24443137a9a2b31eb9107079d39ed281e2c7209260f SHA512 111d3363212b86fbe1abf3ff7087c95babd2eba4c315c67e480f881ffe6a42c6b0a17942f195e5a1e1f6e1591a3a0191e1cb5331bf896f40c2e2a7a674b734ab
+EBUILD nvidia-drivers-470.103.01.ebuild 14294 BLAKE2B 3a592377a3787436a0fbc293c918c967aff50b4a1d885f971eff27685f7b7da5d5faa6e2fe3fe5993c46579d31ad01c7e3d48e245e0ba2d1275c514940525eeb SHA512 4992672eeff7ca14ed1e5e72b9ae7ccc4d025ef77b6e19f90a0c4616b1b0f8241de028b406fb5424ec1e54e9141f01485a7b82d848aaa345978d9c95f3a94572
+EBUILD nvidia-drivers-470.62.26.ebuild 14327 BLAKE2B 9c6e9a7de503e5b23c0ec5f8f3ab9da51359fd3a319a7390f8577ad435d0bc1647bcd1a32dd1f1f2e35ca51221adec5597860b1bb0d2e79ce17fc4b47446ee78 SHA512 48d1a1e6905af53ed48a688fabb22691b5c66221095a94410161637fc0089098bc583c66248a663436307bdcf31f2d0243558b75f9942cb3ec8e5767b93bbc74
+EBUILD nvidia-drivers-510.60.02.ebuild 14782 BLAKE2B a99d714485cbc75a5f67993acef6d9b1f23530b0e6abebd5e1af14cb63d1c8c01816a1141984a6cdbedecfa26c8287b56debf6ff0de90b6b5925cdcff2da93ff SHA512 a6d3a77f9a3b05305a42971adc5cfb34d20c6e16c7fec3437beccbe8f44d509c3ff7e38d5a7e33f3bcba5a25c03f7c2b41c22116c70b015df2d719189f82f207
 MISC metadata.xml 1116 BLAKE2B 479c5a58e636b0e3f6600575dce8d4fddfc69e74a0a1e0859a50b829b3781e8a24a687d6d740feeb8e291d2d28d6575490cc1f9733c90cb6cb9a36bd2d47be8f SHA512 1c5c91d847b051b120a5e5faea974b99a18b19ab472ab84b9d6e35c0e1b1a7975e9f35317dc016b19c80d7b6256a1ce07b78132fa0de651d35aad28b91d68b99
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
index 6f78688c0c24..70758e3edab6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.15"
 NV_URI="https://download.nvidia.com/XFree86/"
@@ -132,7 +132,8 @@ pkg_setup() {
 		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
 		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
+		ewarn "(Gentoo will not accept patches for this)."
 		ewarn
 		ewarn "Do _not_ file a bug report if run into issues."
 		ewarn
@@ -397,8 +398,8 @@ pkg_preinst() {
 	linux-mod_pkg_preinst
 
 	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
 	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 }
 
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
index c72d3a22a87d..927302a8b1f7 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.17"
 NV_URI="https://download.nvidia.com/XFree86/"
@@ -133,7 +133,8 @@ pkg_setup() {
 		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
 		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
+		ewarn "(Gentoo will not accept patches for this)."
 		ewarn
 		ewarn "Do _not_ file a bug report if run into issues."
 		ewarn
@@ -371,8 +372,8 @@ pkg_preinst() {
 	linux-mod_pkg_preinst
 
 	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
 	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 
 	# try to find driver mismatches using temporary supported-gpus.json
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild
index 3b539a6e7020..a04389a83803 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.15"
 NV_PIN="470.103.01"
@@ -133,7 +133,8 @@ pkg_setup() {
 		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
 		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
+		ewarn "(Gentoo will not accept patches for this)."
 		ewarn
 		ewarn "Do _not_ file a bug report if run into issues."
 		ewarn
@@ -371,8 +372,8 @@ pkg_preinst() {
 	linux-mod_pkg_preinst
 
 	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
 	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 
 	# try to find driver mismatches using temporary supported-gpus.json
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild
index fbf63c3390ce..869bb3b67904 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MODULES_OPTIONAL_USE="driver"
 inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
-	systemd toolchain-funcs unpacker
+	systemd toolchain-funcs unpacker user-info
 
 NV_KERNEL_MAX="5.17"
 
@@ -135,7 +135,8 @@ pkg_setup() {
 		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
 		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
-		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
+		ewarn "not be given and issues wait until NVIDIA releases a fixed version"
+		ewarn "(Gentoo will not accept patches for this)."
 		ewarn
 		ewarn "Do _not_ file a bug report if run into issues."
 		ewarn
@@ -385,8 +386,8 @@ pkg_preinst() {
 	linux-mod_pkg_preinst
 
 	# set video group id based on live system (bug #491414)
-	local g=$(getent group video | cut -d: -f3)
-	[[ ${g} ]] || die "Failed to determine video group id"
+	local g=$(egetent group video | cut -d: -f3)
+	[[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')"
 	sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
 
 	# try to find driver mismatches using temporary supported-gpus.json