gentoo auto-resync : 26:02:2024 - 17:40:44

8 files changed, 24 insertions, 14 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index dacd57e6c02a..ebaf6e5d0cdf 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index b297ccb19fac..b9aefc20155b 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -3,13 +3,13 @@ AUX nfs-utils-2.5.2-no-werror.patch 1907 BLAKE2B 8d9ac90d445dd029d8db80ff39559d3
 AUX nfs-utils-2.6.4-C99-inline.patch 573 BLAKE2B 7f05e51f94dcef942feaf15be3f82078d1915ffe174c8d856ab810a03f2a4cd8c5ee969c4bea50d2535f871bb1368c2f67b1e35c7ff7b9285ee4c7c60c94464f SHA512 b83a53b733178f1088ce7c8dad33af20e59343f5fc6bb76e91905ee19c99c827adacc73a644b3df0085544b54a9aad30764cd08e935eb2d2e03cf4ebf6994912
 AUX nfs-utils-2.6.4-includes.patch 1254 BLAKE2B b741302756690872ed218a830695abea740704e6e0850dacd17c471519337f22b268b6902849cfb83165f0dec9bd42badf2b67642564ba18c7d149d636fee55d SHA512 ec59556ac8c0626fbd37eb27e152d8994503ffc890eb95844bc705ea2241fe57a8ace109ffae4d1b2d4c36ad78994fd39f3b3bd5d7336a6cd02fddb1f3bf76e9
 AUX nfs-utils-udev-sysctl.patch 1388 BLAKE2B 843cc5f0f00e665cbd731588784193b08b45a3e16aa79d303751f8b019083404db74e78f6bc35ca8f894ff0a60ee2f374c1108f21b13be66d7049b6e46609add SHA512 2d9b6189c2e6db96a487fbae2af80623c7157ee52a51cb63afba547f05f81ab8a291c7b7001b5faf8e58cef290fd23cc2d1892f97387fc842f230d23218d06a2
-AUX nfs.initd 3907 BLAKE2B 1dc02a0d3a794cceae2348edf86c190f1ec77d10e1de4c66e7654d080d9fe1614bdd4606829d208db99a21ae819b18520697bf285ddf26a5bb8a15fcdd6fbf4f SHA512 56804513a49ed08605499c96c384415d3965331793f730cac04c6e693c87d5a0f0274a9d7ade881ed9136bbc32e961aab429527de757f7293f693ff04b91b147
-AUX nfsclient.initd 752 BLAKE2B 8e3303be602ed97b9c6db0238b950039ec87830d733e7490f62657953e18d8050d5cd75e603d566b00db86ba910384d36e488d149112c86f1b9ed8e0901f5c16 SHA512 85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb
-AUX rpc.gssd.initd 455 BLAKE2B 9831c82341737d7877b01deebff82bfc49be59f8faabe4b5ee5542912b488460efd226f01e0bad5486faff5f37579ac15c8e8cf410a5eccd79d690c34f2beb4f SHA512 d9d7eeebbe153d3c4784112ed6d50734b5619b3315bb1454f8163de2b78ed8f958029a0e1088de58e9b1b8069184aeab2c8f19af4b957b6be25e4f138960aeac
-AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf297015e6651a4c683a075fdc29d037bc44a9832d45be87d41f37eb4e00ea37fdeed66038cf4a93d1a260f SHA512 f3e88038cb040ffcbca76166f4322d37e39da00d144bc0a17aed4467ab10c6e626fcde6c407d0911d135bfab55622ad2e38ed93788b11459c5882ce60577fb45
+AUX nfs.initd 3913 BLAKE2B 79f228ae023d003964a02eee16eaaa9be1feeb5d06bbed2b13387e92718f391698034309b1f78c187cf372d09c15e2f60a9049901d51d7b3c9e741e5ab34180e SHA512 dcdef7872553848cf7e1caea1dd1d5a03bdcb4b1f96c27579e17c56385ee25b755c57abe57947175e1c48a6b5f318834282252fda49a319db886d615b35e5314
+AUX nfsclient.initd 758 BLAKE2B 0a8bd339a0f4e80fc0042ad01ea98377f46d78342e114af40f7897a4594f0e86b83aee77e050e43ef174577e54310eb90f55ebb6908e2725d30d3f33455d4af4 SHA512 e06bd041700f4d23a6e69eebdd2552d9f7f9135dc98278302de8179dd39f26f5a390dad56ff3f48fd81b85f058fe8692435af369353913aed19b71ab3c6683c7
+AUX rpc.gssd.initd 461 BLAKE2B e919de88c2ddbdaf7f2c889a07907e54c7328cdc2ad82b0667fdb06402bbf3d277e527f556c983f3bde7cd06c6d25ca7043132ec2fa8d572359ad423eb848a92 SHA512 d663703d9d933b007c077664a028a7595b546891b11cde8052ae15972dcc8e809b83e5c7fcf1e3b9eccd8360db0943225749dcd75b78ca6ea51f874e5687a50a
+AUX rpc.idmapd.initd 488 BLAKE2B ce2fb9baec7295977ef29cec96c1de12582f19a113e0732aa728c58447d722a2a144ddc10d85a548cd1f1a053d6c0b569441a811ea8ac71d7b9e6245e4576e18 SHA512 34e9d0583a26170b9c2b4c0cc9d39b0ce81b21f4c88c10066fd30dc666d24f9a2c88968c8df3c627669f4b6b66d65f74df5516fa9e8eb80913a38c705b9a803b
 AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
-AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
+AUX rpc.svcgssd.initd 476 BLAKE2B eeb4c7857c650490795a8347c0a3bf1df1e1446aa3b8bf05f4e08e20a83afd977be2a80a60a5d117b205e9af30a2e2c40b49c4c99276f72efed71f9ce1e22482 SHA512 5d1f7fd4090d05a68a6e1e172d619d5fddd1f5a956f9e6a68bf11330eaacf7c4e848387959ed4949b43127c13feb33d957b8ab4311a594e5e96cf9d4abef3f81
 DIST nfs-utils-2.6.4.tar.bz2 979652 BLAKE2B 45f6e9c98e8148e82684526c2ab0f8976b2a46fd869d91f03cf9afffbaad64b77dc1729a50b74d30c5d65bfe213a1da2f54e3d3e19539b61994f7b65671a26ab SHA512 e5fde25c54f594d00e69c9aeff8abc22663b994ecd37d8516751be98b51b12c61ffec47ee128794e170ec773f0649cb594df1ca104ec4dba561823db423f8533
-EBUILD nfs-utils-2.6.4-r10.ebuild 5444 BLAKE2B 9810aad1e9d554f130241f17b552cd6585d41261b3eb4762d78d0536264c9c7cebd5043436273c9c6bfb7e48e971a678a709e80fd76cd073b53afb514df8b294 SHA512 b7917a88b9fd48e691c572a942288e232da7d0754a4667ed6c09fa97979880b6e8420a75cc173873bad9c106011a5990d584d5d1c78326c8e6ba25524c2ab395
+EBUILD nfs-utils-2.6.4-r11.ebuild 5585 BLAKE2B bc3bd4c4a947044f981e362508654da2b37327596fdfa556c21180bed11355cf9514ebaec0f8b27e7e7e13b2a2020af3fe44ee4942d6c93a7e7b8a0f2f17ee71 SHA512 c218801b66233304b664f2983107acef85c3306a87e2000fd8345425d18aa64017b442ef121bbfe04e484ddba809ed855d34d1f0c1d9d69d1aa54e0c6d83d491
 MISC metadata.xml 791 BLAKE2B 485b8c79a2c3174f1f8e95a153c8aac2346f2018817f2d461d2b68a8c8584ee16de42686aba65532b7393cb479d358cd9c8e0e7cf1e0273422bbd4e734231dfd SHA512 1ff20e3a93976961db2b32ce32417826e83366ffac397206872f323048b0468852b90234dcb74a662fca3a18248a96def3a47d01cfdc9a51774cbfdc279bd421
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 7c1de560d1da..88a13a85db38 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -24,7 +24,8 @@ depend() {
 		}' /etc/exports /etc/exports.d/*.exports 2>/dev/null
 	)"
 	config /etc/exports /etc/exports.d/*.exports
-	need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
+	need portmap
+	need rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota
 }
diff --git a/net-fs/nfs-utils/files/nfsclient.initd b/net-fs/nfs-utils/files/nfsclient.initd
index 6724e913d10f..e278cbde0539 100644
--- a/net-fs/nfs-utils/files/nfsclient.initd
+++ b/net-fs/nfs-utils/files/nfsclient.initd
@@ -14,7 +14,8 @@ depend() {
 		done
 	fi
 	config /etc/fstab
-	need portmap rpc.statd rpc.idmapd ${myneed}
+	need portmap
+	need rpc.statd rpc.idmapd ${myneed}
 	use ypbind dns
 }
 
diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd
index 445d44c44473..7bfe920b3d54 100644
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
@@ -6,7 +6,8 @@
 
 depend() {
 	use ypbind net
-	need portmap rpc.pipefs
+	need portmap
+	need rpc.pipefs
 	after quota
 }
 
diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd b/net-fs/nfs-utils/files/rpc.idmapd.initd
index 61cfd4de2e73..9cb36000b5ed 100644
--- a/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ b/net-fs/nfs-utils/files/rpc.idmapd.initd
@@ -8,7 +8,8 @@ rpc_bin=/usr/sbin/rpc.idmapd
 
 depend() {
 	use ypbind net
-	need portmap rpc.pipefs
+	need portmap
+	need rpc.pipefs
 	after quota
 }
 
diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd b/net-fs/nfs-utils/files/rpc.svcgssd.initd
index c714e36076f4..11bc4265eddd 100644
--- a/net-fs/nfs-utils/files/rpc.svcgssd.initd
+++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd
@@ -6,7 +6,8 @@
 
 depend() {
 	use ypbind net
-	need portmap rpc.pipefs
+	need portmap
+	need rpc.pipefs
 	after quota
 }
 
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild
index a50758b8b9eb..b64941485bd6 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.4-r11.ebuild
@@ -167,14 +167,19 @@ src_install() {
 	doins "${FILESDIR}"/exports
 	keepdir /etc/exports.d
 
-	local f list=() opt_need=""
+	local f list=()
 	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
 		list+=( rpc.idmapd rpc.pipefs )
 		use kerberos && list+=( rpc.gssd rpc.svcgssd )
 	fi
+
+	local sedexp=( -e '#placehoder' )
+	use nfsv3 || sedexp+=( -e '/need portmap/d' )
+
+	mkdir -p "${T}/init.d" || die
 	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
+		sed "${sedexp[@]}" "${FILESDIR}/${f}.initd" > "${T}/init.d/${f}" || die
+		doinitd "${T}/init.d/${f}"
 	done
 
 	local systemd_systemunitdir="$(systemd_get_systemunitdir)"