gentoo auto-resync : 08:06:2024 - 00:08:11

6 files changed, 44 insertions, 18 deletions

diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 83ae4a3283b9..7b8972393eee 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -1,5 +1,6 @@
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX legacy.conf 80 BLAKE2B 23eca4dd1743a5cf77767894d23d419c1663147c5aee6be971da64fdea0531eadfe97ac8bc4e63b44404dcf89940d438de6b7081158b78639945ce0fadbb103c SHA512 f74f05991102b644dee7822a80cb8e6c14cd1eb48bd9342bc662d5947b9f04d32e875d2a5e6476a67bdbface4d2b2159b99c11d72eb4658c5cb4caf595f138be
+AUX musl-efi-wchar.patch 938 BLAKE2B 92cf6983032a1bbf39255de7ed77371113fa87b21b9606c3d3d83bbcf868933d3d49301faea90fcf64f4a4accb03aa7dabadb57f8940f7df91f5372ed2c953b1 SHA512 17f44277678e30d48c57dbf99380b955c06c444e0986f8beb216064297eb4e5e95162433ae4e3230eda9a4e0d9ac342706e4f1ee55e7ed96d4bb16d760240537
 AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba368f6f900d1d540f50493905a2cdab35ee3d216c9cb45e821251bfacc4965ad5a2ca7b1e1ae5627f4a3680 SHA512 3084eb1623b56cb09e4c9bd3e314a3e1d6d88f002149bea75b1c506a30b6345c51c7a90a1330baa5eec86ae6b90116f9970d8ff5add91929167df84bef6e82fe
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
@@ -11,8 +12,8 @@ DIST systemd-stable-254.10.tar.gz 14428960 BLAKE2B 488c27b9657ec7452f876ab6c18bb
 DIST systemd-stable-254.12.tar.gz 14529517 BLAKE2B ed6e4a78363930840e505c4bd789d1d44c238f30d3c0768d435e1cacb43ac3ab07e0dc9085546b4142152bbb4ceb4e2c0a9560e74e1a2b8c09fc885620695e73 SHA512 fa3679915392e641bed73ccb48f5def386ab13ba5ff7efdac952214193c3311543bec4c4370d6880f9599f63e377506b343805c3c56b7dde7eb5e3bbc0dc7a87
 DIST systemd-stable-254.13.tar.gz 14533359 BLAKE2B 6f37bf5f1868840f122652fdca270e1f97ba78f8280f45100b1b5b33c3531cf79587b596ccbbe594f1e623d918c1fdf19f2231d677e27b5421f1852fbe3225b3 SHA512 852cbc992128dc3ab6ded4215c2540fa3c0b7c7ad98e54036f3981d77a2162f5393ee50960773419133e0d584844af329d3726f45829a56c00b1827e33edf3e1
 DIST systemd-stable-255.7.tar.gz 15068684 BLAKE2B 6fb5415d9e013bc8695ef837affce7063d214027529412a25ea73eb25473d1f07cff6ad3ea3ea18b7bbf9d73d2bb8e39838e1aeb2a14d016b3b47e4ba24d02d0 SHA512 1cd2a00f292751b923bd93c60bdcdd66d82792b45e32dce11d77e2b3b6fc5c8ba4c5db386652deffa8c24e75032af1a745700ba91f1726e249f0c447daf85c2a
-EBUILD systemd-utils-254.10-r1.ebuild 13317 BLAKE2B b7694b1f3d640819a80c299ab825ebfc8b4c37d0b6b4f5dbb507af8b31534ffdcfd572132b3062ed93a146bb2173b4e04cebf0e09f9190025903d9ad11a02259 SHA512 c2bbf5f8b8b009386ae680b352c3b1ae3e16e445d21ecc84540d68ac4375b24bfbca9ffd3cc1d633c92a740b2c25b092c22221e527f64239872f122525a99441
-EBUILD systemd-utils-254.12.ebuild 13325 BLAKE2B d2653bcb36e4a3af84ea28c8ddd1fb5fbb6015a297d519827f3f2895366fb7e37217830470eb2e352ca47d197fee067fe075774c23946322afbcc9a59caf4969 SHA512 74de09c449345a8d3817a5b87a99ad66a0caec148e365da13b992cb0d2cd94426fc5db535b84b483361a0236e89a26814ae8cbac9972b6b721bc7aab855f67d6
-EBUILD systemd-utils-254.13.ebuild 13318 BLAKE2B 4989c2f5490ee1e91836f626bc57221adf104fcbf0c38466a4404eab6e9fa4dd98edad7dc9e85caec7b209dc0e17837e2be9e0ed42d75ca383642c6eda952b6c SHA512 e932919621c7132a3c61dec276b06fec38d52abeeeb72a92f12219a00382d253142384eca58923bbee029f80abc7b8d1c5783ab1efb7893d42b3ea7db5d1093c
-EBUILD systemd-utils-255.7.ebuild 13764 BLAKE2B 774c6cd3219ad89167dca515e9dd4f374a15747ef6c7aeb7d22337ad66dc258102bb4cf30761c81a5f2f29fb144a5865064ae01f016bff45eab92584c6c67221 SHA512 5f59fecb39ee6af1f7fa019663598cec359c5604a0b73f6d983f859035942ce7b5e402fd390ef112ab296fa91a378e5522ec61ef75ffec74511e0c831846f457
+EBUILD systemd-utils-254.10-r1.ebuild 13355 BLAKE2B 9e88dd7b2bc7c280aa4430d9e4ec9bea942b365408c775d0e5a53ae9d6b1eee3f79bada47ac83f3f3b4bd0fa5245b3158fc48e4b5003ba15bb7c3eb9179c9bc2 SHA512 86199fe50859269f739b37d2fa6d345b17ad90edd0aefd203f3beafdfd36c79affb16a61546da919e984836fcaded2831bd406f7123b0a84ee50ef65ac4d8b5c
+EBUILD systemd-utils-254.12.ebuild 13363 BLAKE2B 21cc042bc1041556b71f12c160a8fd5b23f31a9598d6a85b13b77ccd01b5b0e34350bde236f151662873734003fe2fd5a001c746370c16fb8308fb51e283d843 SHA512 9660bcde5c1a06aa03dd7bc90aad59421eeea53757ed1edc2d674c1cddc0addf6b7670520426bd569c5f3e309f66ab641362c260c1fbdfdd20fb10198032677a
+EBUILD systemd-utils-254.13.ebuild 13356 BLAKE2B b4892ba9c9ab31ded67652533fabf4f36d5b76377ea14e5d145795bb45cbdcf300660f1a54abe61a050a3287c08309e8fadfcf5f4d17b0c4bc7640b5382499ba SHA512 c8d72fe488c33f75f3e9ff11fc885befed66b61f3dea70c1e367b91a037536bc7d4668983644048c1099e07ee0977203a8ea6908b89dbd27371f5b1e4ce1bbd1
+EBUILD systemd-utils-255.7-r1.ebuild 13700 BLAKE2B e5410d9a84a8a11fa26900d2f8bf95c7a955de574cb2bc3a7fe6cea3b15a130a2eee35ada345fd10ae8bed3d981d106db9458000893560810d4985fa1b9166c1 SHA512 34c573fbea37536d52e1c17030e299d227324b74155ebfca9166a5391c13d03734e718df27b634e9871d2c5bbcbce030671494094aa85472b327dab802c12c98
 MISC metadata.xml 888 BLAKE2B b799e1d62a1208dbbec1a1cfb47592b069d5c79cb18efffef922c72b0d61e30938d26c6f4e0d3951f9c327601dd71de14062dad0a47e6b84a61b1a8b125f1a6b SHA512 6debd964f9c127ba4332e0c0b86e506d3cf10cbe3cd45442bf7955b16e790a9eccdd928d473b3722b11b4a75d34fe5bb91f4867a5dc92e786ba73d9ec3f54712
diff --git a/sys-apps/systemd-utils/files/musl-efi-wchar.patch b/sys-apps/systemd-utils/files/musl-efi-wchar.patch
new file mode 100644
index 000000000000..a3681552d33f
--- /dev/null
+++ b/sys-apps/systemd-utils/files/musl-efi-wchar.patch
@@ -0,0 +1,29 @@
+From c4050bd401611f6223c00e58ac9c26b9caccd286 Mon Sep 17 00:00:00 2001
+From: Violet Purcell <vimproved@inventati.org>
+Date: Sat, 9 Sep 2023 13:10:53 -0400
+Subject: [PATCH] efi: append -D__DEFINED_wchar_t to LDFLAGS
+
+This forces systemd-boot to use the wchar_t type defined from
+__WCHAR_TYPE__ in efi.h, instead of the wchar_t defined in musl's
+alltypes.h. Adapted from openembedded's solution.
+
+Signed-off-by: Violet Purcell <vimproved@inventati.org>
+---
+ src/boot/efi/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
+index 2773eaf286..3c1e09c729 100644
+--- a/src/boot/efi/meson.build
++++ b/src/boot/efi/meson.build
+@@ -130,6 +130,7 @@ efi_includes = [fundamental_include, include_directories('.')]
+ 
+ efi_c_args = [
+         '-DSD_BOOT=1',
++        '-D__DEFINED_wchar_t',
+         '-ffreestanding',
+         '-fno-strict-aliasing',
+         '-fshort-wchar',
+-- 
+2.42.0
+
diff --git a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index b906b6110034..af3b023e8eb8 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
 		if use kernel-install; then
 			targets+=(
 				kernel-install
-				90-loaderentry.install
+				src/kernel-install/90-loaderentry.install
 				man/kernel-install.8
 			)
 		fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
 		if use ukify; then
 			targets+=(
 				ukify
-				60-ukify.install
+				src/kernel-install/60-ukify.install
 				man/ukify.1
 			)
 		fi
diff --git a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
index 4e14021f3732..d76d79f1f07f 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.12.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
 		if use kernel-install; then
 			targets+=(
 				kernel-install
-				90-loaderentry.install
+				src/kernel-install/90-loaderentry.install
 				man/kernel-install.8
 			)
 		fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
 		if use ukify; then
 			targets+=(
 				ukify
-				60-ukify.install
+				src/kernel-install/60-ukify.install
 				man/ukify.1
 			)
 		fi
diff --git a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
index 29677faa1af9..3f52033ed095 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.13.ebuild
@@ -292,7 +292,7 @@ multilib_src_compile() {
 		if use kernel-install; then
 			targets+=(
 				kernel-install
-				90-loaderentry.install
+				src/kernel-install/90-loaderentry.install
 				man/kernel-install.8
 			)
 		fi
@@ -368,7 +368,7 @@ multilib_src_compile() {
 		if use ukify; then
 			targets+=(
 				ukify
-				60-ukify.install
+				src/kernel-install/60-ukify.install
 				man/ukify.1
 			)
 		fi
diff --git a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
index 01d50ad73596..dbab6cb8489d 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.7.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.7-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.t
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+acl boot +kmod kernel-install selinux split-usr sysusers +tmpfiles test +udev ukify"
 REQUIRED_USE="
 	|| ( kernel-install tmpfiles sysusers udev )
@@ -86,7 +86,6 @@ RDEPEND="${COMMON_DEPEND}
 		acct-group/usb
 		acct-group/video
 		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
 		!<sys-fs/udev-250
 		!sys-fs/eudev
 	)
@@ -138,6 +137,7 @@ src_prepare() {
 	if use elibc_musl; then
 		PATCHES+=(
 			"${WORKDIR}/${MUSL_PATCHSET}"
+			"${FILESDIR}/musl-efi-wchar.patch"
 		)
 	fi
 	default
@@ -291,7 +291,7 @@ multilib_src_compile() {
 		if use kernel-install; then
 			targets+=(
 				kernel-install
-				90-loaderentry.install
+				src/kernel-install/90-loaderentry.install
 				man/kernel-install.8
 			)
 		fi
@@ -357,10 +357,6 @@ multilib_src_compile() {
 				rules.d/50-udev-default.rules
 				rules.d/60-persistent-storage.rules
 				rules.d/64-btrfs.rules
-				rules.d/70-uaccess.rules
-				rules.d/71-seat.rules
-				rules.d/73-seat-late.rules
-				rules.d/99-systemd.rules
 			)
 			if use test; then
 				targets+=(
@@ -381,7 +377,7 @@ multilib_src_compile() {
 		if use ukify; then
 			targets+=(
 				ukify
-				60-ukify.install
+				src/kernel-install/60-ukify.install
 				man/ukify.1
 			)
 		fi