gentoo auto-resync : 21:05:2024 - 00:05:35

4 files changed, 14 insertions, 7 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 182f38bacb2f..240e0e7e9e59 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -10,7 +10,7 @@ AUX util-linux-2.39.3-libblkid-luks.patch 1499 BLAKE2B d08f33f3be0709abb3969a898
 AUX util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch 1710 BLAKE2B 04a3b4db45447556edbf66bdb9bf9c895cdf47a801b41743603b14420bcffe9618c17c8153b6800b872dbc28d1e5c33a55667f2a31e9ff63f7f026c1beb9f524 SHA512 da91fb5f9443907558f6245d4eee3f578e0f0549866a6e9f39bd82d6123868180c1d2aa357e5ef47f163b7ddf67d1c24f6a4768837f21577b2887555a956afe9
 AUX util-linux-2.39.3-musl-1.2.5-basename.patch 1814 BLAKE2B 29463f6aedec98cbd7edaa68e3ef0b6c7a4932e6f1b02948237689e75cb720d406970a6521564dd97c68c922b087f23683c219550c5092755057e734f94bc338 SHA512 74f6ccd530766fdbaac55a20becc8e2ce8dc8aeb65aaba3d22430a7c72e19e9483031b508b4448507d245d42e6d730d0d17ec6bc8edb63eaf0cb8ce0365be4d7
 AUX util-linux-2.39.4-umount-readonly.patch 1519 BLAKE2B 80fdd82a9fda61e8cb03a5ceed5f601687cc8a621e8cf2c8d71125bf2aa849d32c413253050d2e4680bbf1636b8add212fe6dd4f7802ccd59b0ff677854b600f SHA512 240863efa932d385aa6b6d999624d4630bbbf0b5ae92f1f341df940167009eeebe0ccec2c460fce69a19988f96a6fa988a740682b3da864ebfc21b1bbeddd3b5
-AUX uuidd.initd 209 BLAKE2B 6c5cb40a6a51643b3588552b3eda5617bd4ee2977b7f11240c354b27225538cfe2a5980b814e0034fdce28cfff790424a7cb8a1aa96d6cb3a6e6f618784d0760 SHA512 7db3e5519c1957f8bcf4611cb1e69762a2714e251f4063ad231d558866535fce30fe88d4adca973bfeb4a5aac38cb276ff2eb271353508857cb97bb127f31ac9
+AUX uuidd.initd 380 BLAKE2B 9c72790654c03d96d059cc8b52ec68ace24c036198e60fd1cd42c06460e426670417a319e97cf82a423c7870b7c966cb9736cdf313929822107b95a50bcbc24e SHA512 5892808de27bcb1bcd4b2498a3208bc198c00c48101902eb0ead005ef7d812f21e824e0a50ab57c900d83cb9d24c66fbd863118faff964b3aa2e844ce17bbbd0
 DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
 DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa
@@ -20,6 +20,6 @@ DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923
 EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b7848e3c85ab0d548672283cc76bf34eae1bf80aa39cc9afaa7105e5ad9bf0ed0494ddbebe062e7dba6aa9ec0616ee77a7eb2 SHA512 b8cc2a20122f1c094cfbd4fb3652672cf7def1d6d9b38971f2f52511893f9de1e7774ed06c03a17c4b19d58cc564a1291833974ffe0c43778d077165f6f6f538
 EBUILD util-linux-2.39.3-r7.ebuild 11232 BLAKE2B 09dcc169238dbec2e428420511062be1571484086784925f8c727ad89c10e4db37d164f2777c7f259f43ef6399c8a36d7478fe2ccb5215fbb683f6e79a81a73a SHA512 ca017f44d330ca86e64413fc78353118cbb75304e60d8c700f1e30e466a614fd888670e9232a12445311828bc356fa00008ea60b935840115da7b96347b40e42
 EBUILD util-linux-2.39.4-r1.ebuild 11142 BLAKE2B 1ee7d40ec8a47faafe30845a712be27f31689db47882d95195474970d0ad4dc8fc741782a6b2e8b46e8ed6a87d106f689f226c86e65bfd155bd7739271a282f8 SHA512 f7767ef10dfde3b1c8342a87f576ec2994018b7d22283e9dde2fed33e0711ade68d95f8a2d8e31ba2fea883f8720a9f6024ce02068950fead868436b9fc5ddaa
-EBUILD util-linux-2.40.1-r1.ebuild 11331 BLAKE2B afff7841cc378a8ea14631f1cc4fc28cd93c23f5d1ed7ec5bc1b23f6f505c4ff37e5d60cc5508dac692554a1aeae10a6eba14230e8da7faabbd3c752d5480600 SHA512 525715bc25ef55a6f323c6d91151a36ab21d6483f098db83f001e9df964dc55e60b84a0e48896df4f4b263489608011916db235dc891832e3ec3bd0086349f01
-EBUILD util-linux-9999.ebuild 11275 BLAKE2B 7bb396dfafd83a1b8e3fe68792240277ca0f3a2b7c067c3b11e954be3231ad841ac0d98977df46133ef9d4373c9c6c7b72eef42b4f515a73b3f57ccd61239239 SHA512 e321c6ac7afb959707ad8d7ab2e65d9b1fc29de252424af0a77c687fe78a0f1c0dfedbf093bb054351b6847292260f582b50cf6eeebc9d87d61d104861ad31c4
+EBUILD util-linux-2.40.1-r3.ebuild 11359 BLAKE2B 73223610da28fa2866598a1c3ee303116c0d1ed72e5dea37e37a2ec6567a05e3f7711896d221bdc947384e8fa09a4712536fc2af532cff8431b885424df16385 SHA512 53303e45451635c137225a168015598dec0e895fa7b50eac1d61543a66440bd692df370528291c075c900f3aec359d33310a3edce31fc8a0f302da5646d8e2fb
+EBUILD util-linux-9999.ebuild 11303 BLAKE2B 9f11f485707d401119e1dc7bc8c1e2808d27e84d9b8e8d4a522f6ea23b5b9274df99d4627ab4421a20692babaaef0a05d066ddd97ad82608b3fab4e5c3970c40 SHA512 aa0e0bce5b200a7b7ecf08d81c187c09276299d7bd2c7bce3b494b55fb78f73fb2d39f5a65226a78f93cdb9093f4f2d4444c1bf7c1f44280d4923834b51eda99
 MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd
index 329929e9a9ab..3ddedc3f3b7f 100644
--- a/sys-apps/util-linux/files/uuidd.initd
+++ b/sys-apps/util-linux/files/uuidd.initd
@@ -3,8 +3,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 command=/usr/sbin/uuidd
+command_args_foreground="-FP"
+command_user=uuidd
 pidfile=/run/uuidd/uuidd.pid
 
 depend() {
 	need clock localmount
 }
+
+start_pre() {
+	checkpath -d -m 2755 -o uuidd:uuidd /run/uuidd &&
+	checkpath -d -m 0755 -o uuidd:uuidd /var/lib/libuuid
+}
diff --git a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
index c112b4749522..a9980ed89514 100644
--- a/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r3.ebuild
@@ -87,7 +87,7 @@ RDEPEND+="
 	)
 	uuidd? (
 		acct-user/uuidd
-		virtual/tmpfiles
+		systemd? ( virtual/tmpfiles )
 	)
 	!net-wireless/rfkill
 "
@@ -426,7 +426,7 @@ pkg_postinst() {
 		elog "might want to add --noclear to your /etc/inittab lines."
 	fi
 
-	if use uuidd; then
+	if use systemd && use uuidd; then
 		tmpfiles_process uuidd-tmpfiles.conf
 	fi
 }
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 053f45a99077..f3ea42edeeff 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -87,7 +87,7 @@ RDEPEND+="
 	)
 	uuidd? (
 		acct-user/uuidd
-		virtual/tmpfiles
+		systemd? ( virtual/tmpfiles )
 	)
 	!net-wireless/rfkill
 "
@@ -425,7 +425,7 @@ pkg_postinst() {
 		elog "might want to add --noclear to your /etc/inittab lines."
 	fi
 
-	if use uuidd; then
+	if use systemd && use uuidd; then
 		tmpfiles_process uuidd-tmpfiles.conf
 	fi
 }