gentoo resync : 16.01.2021

11 files changed, 296 insertions, 6 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index f7ffe82c3cbb..e31be445919a 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index 3d23e9b916c5..98f89d4b261e 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -7,10 +7,12 @@ AUX os-prober-1.79-fix-busy-umount-message.patch 435 BLAKE2B 547286075651f19518a
 AUX os-prober-1.79-handle-multiple-initrd-paths.patch 1133 BLAKE2B f82902b7641288bb0226e0ac46eb375f2e813cc8fcf01691ae64c82a9f06a9ad8b597bb553ed36c7a3cce95529d3a94e300c1820774a5f8322ff25dab93a2cc6 SHA512 87c1cda3d6b05df53a0e0cb06ef8c53490d9b93eb8cdbade625f31a1353caa9bdc5d068683a4e1f5d259adbbcbc9a2d18c5a9ccedb56d4140ea0dbfc8836ccda
 AUX os-prober-1.79-mdraid-detection.patch 848 BLAKE2B 11ec43662f174d7f12f09b9b46f57ea7519d45aa1560ef31fc9c75b2684d1f549b3a679aa3f6dff855fc79c72757f0814ea147e75536f6503fc76f3426f8c648 SHA512 a4d68ea8cb6dcc2fc452a15ed983cb911e6a6097ec48515511b94c7f0096c6f611ffb4bf8af3c373cc5774f94e398ef74e1e2a8fe68669ace31bed134e839697
 AUX os-prober-1.79-mounted-boot-partition-fix.patch 555 BLAKE2B 9b98506f986ceb509271a8a1ce0cc357fb25402ec1059d16411c79e96c727ef40182b5d9f362f16ae4ddab95a45155380cc5742ad1f15ac2cd39fdf273fc9a90 SHA512 fa66356859001d15823c3dbe8143e905e25ee937c236c787965b2a9a50493b55006e0fc9190b076fe106f942ea6074ef7556a443a237d0108b6b936106186061
+AUX os-prober-1.79-ntfs3.patch 909 BLAKE2B bcfd977f6ed5fb82503ffce6b02f54ce132df941dc14777c87e506bc7bdd930f841e2772dedbce9d38661e9cf8ef00401667d03b14c7b541e8cd0df2f3d52003 SHA512 ad4935e95679d014f52b1bb177b97ba3bd341b8435402a49cd3cb51158dab116cbae1a9ffee22b7b484581cea7d8b3daa684384974593cda4a6153752726fb24
 AUX os-prober-1.79-use-fstab-name.patch 1101 BLAKE2B 37353efa899fd72e68d297325218be5a81abc2eee50bda5607e87c0eb799924fff0f510b4f13c681213e5e4be864a62fec9d5c98e539a61e9cd4036315eeabc5 SHA512 25236c935559398a4c37cdec04c358787f6178a016a6d0d4780c7dcd9eb7e18f308f4a89a1ddbb37d6c7dd17d334d879961029afb4463cef5e9029eab58fdc5c
 DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
 DIST os-prober_1.79.tar.xz 27028 BLAKE2B b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d SHA512 89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
 EBUILD os-prober-1.78-r1.ebuild 2233 BLAKE2B 7fa1535d0b90ec18c1ec2a49759915a786f35657a1bbed560239fed784e87d8517b2754c315017013f72398d6159faff5178f9976963443fd42ac52c6210f4db SHA512 54cb1e72251533af64b65675b1fb5833c699f9f91c6d20586268e5300a7977e2d95dcd3e8d32629ac6aaf45a9fecc434151aff4d7e656f577ae42f17c15b2f14
 EBUILD os-prober-1.79-r1.ebuild 2587 BLAKE2B fddd96476140557c8b703ed11d6a73c609d9c233f54eb8258356aed4a80f0724b8cebd8ff3b0ffab3d28608467a1ab013d268bae195a0f9834ef6802a474d8e1 SHA512 8b1715a9e321b84cce144715efb0856c174eb0e0a95b365cdadad0c16364fefe13571a2795e9f75d785acde07f695eaa7f3b5f5aba7244ff4200ec7276984535
+EBUILD os-prober-1.79-r2.ebuild 2581 BLAKE2B c0f3ee23478371886bc17163bd090b7888ab530a7a25356027dd732aebf48b22d4e927d41c02ab549c098f6eb71668427a049dca36b0df92dec10db5b3342d3e SHA512 8e9dd8ca77df48de1c0a5897ba1420d8b2e543f9e3749dfd6932f67cfd635deaddb11cdef39b58e3480f10bac8aa0386df69a909038652bba3919cdf0777001c
 EBUILD os-prober-9999.ebuild 2482 BLAKE2B c59a755ba75807f6bdc3f9437ea319ee55600658997a23168f586eb19c4ea1012a9dfc0d637ae18bce2d972f8533e81360249c1af4157e67dad4de242c8dbe1b SHA512 62c4eb2541c01148e715eebf2b65d4ebaa0435a431839360e06509935706cfee3c1c5afc444333e94921f43d767d0964cedc118f9981bf4cb8cc01fcd7ed492c
 MISC metadata.xml 384 BLAKE2B 98bf64680e61d1c0f0c9cbd73ce11be5a98fc7014517d263be8808064b1ab5b7ef200c243c472c3dedfad24176851007d9f4b03399e0970fd351f086b13d355c SHA512 dd391671666f17ce8e45093ff42c898c4bb0c685df9bb631c56089379d0825a15364656dedf4eec13c7652cfdbeb9c4f40f7bae0a8360cadd9b2cff136189bc3
diff --git a/sys-boot/os-prober/files/os-prober-1.79-ntfs3.patch b/sys-boot/os-prober/files/os-prober-1.79-ntfs3.patch
new file mode 100644
index 000000000000..a354445ebd8b
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.79-ntfs3.patch
@@ -0,0 +1,26 @@
+For 5.15 kernel with ntfs3 file system
+
+Bug: https://bugs.gentoo.org/830753
+
+--- a/os-probes/mounted/arm64/20microsoft
++++ b/os-probes/mounted/arm64/20microsoft
+@@ -15,7 +15,7 @@ fi
+ 
+ # Weed out stuff that doesn't apply to us
+ case "$type" in
+-	ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
++	ntfs|ntfs-3g|ntfs3) debug "$1 is a NTFS partition" ;;
+ 	vfat) debug "$1 is a FAT32 partition" ;;
+ 	msdos) debug "$1 is a FAT16 partition" ;;
+ 	fat) debug "$1 is a FAT partition (mounted by GRUB)" ;;
+--- a/os-probes/mounted/x86/20microsoft
++++ b/os-probes/mounted/x86/20microsoft
+@@ -15,7 +15,7 @@ fi
+ 
+ # Weed out stuff that doesn't apply to us
+ case "$type" in
+-	ntfs|ntfs-3g) debug "$1 is a NTFS partition" ;;
++	ntfs|ntfs-3g|ntfs3) debug "$1 is a NTFS partition" ;;
+ 	vfat) debug "$1 is a FAT32 partition" ;;
+ 	msdos) debug "$1 is a FAT16 partition" ;;
+ 	fat) debug "$1 is a FAT partition (mounted by GRUB)" ;;
diff --git a/sys-boot/os-prober/os-prober-1.79-r2.ebuild b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
new file mode 100644
index 000000000000..45b2903ceac8
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.79-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git"
+else
+	SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/${PN}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.79-handle-multiple-initrd-paths.patch
+	"${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+	"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+	"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+	"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+	"${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+	"${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+	"${FILESDIR}"/${PN}-1.79-ntfs3.patch
+)
+
+DOC_CONTENTS="
+	If you intend for os-prober to detect versions of Windows installed on
+	NTFS-formatted partitions, your system must be capable of reading the
+	NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+	NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by default.
+	To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+	default
+	# use default GNU rules
+	rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+	tc-export CC
+	emake newns
+}
+
+src_install() {
+	dobin os-prober linux-boot-prober
+
+	# Note: as no shared libraries are installed, /usr/lib is correct
+	exeinto /usr/lib/os-prober
+	doexe newns
+
+	insinto /usr/share/os-prober
+	doins common.sh
+
+	keepdir /var/lib/os-prober
+
+	local debarch=${ARCH%-*} dir
+
+	case ${debarch} in
+		amd64)		debarch=x86 ;;
+		ppc|ppc64)	debarch=powerpc ;;
+	esac
+
+	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+		exeinto /usr/lib/${dir}
+		doexe ${dir}/common/*
+		if [[ -d ${dir}/${debarch} ]]; then
+			for exe in ${dir}/${debarch}/*; do
+				[[ ! -d "${exe}" ]] && doexe "${exe}"
+			done
+		fi
+		if [[ -d ${dir}/${debarch}/efi ]]; then
+			exeinto /usr/lib/${dir}/efi
+			doexe ${dir}/${debarch}/efi/*
+		fi
+	done
+
+	if use amd64 || use x86; then
+		exeinto /usr/lib/os-probes/mounted
+		doexe os-probes/mounted/powerpc/20macosx
+	fi
+
+	einstalldocs
+	dodoc debian/changelog
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index d6552a235a15..2fb6e7a4d787 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -3,6 +3,6 @@ DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da
 DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9
 DIST plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c
 EBUILD plymouth-0.9.5-r1.ebuild 2842 BLAKE2B eb780d50b0a0387d7f1ed07fab92940c941ad8b6f39519e4a44be1a607d1f0ac9a06c39a1c13f95f6ba39b52e88f4c759604f58717e14527af37422497b2bdd2 SHA512 6502ae41b78a7707380653f16eaf95626345373d7371b50b8ce83658ca0eaf1be2fb83deb1403d31bd47daddf2b6f788d8fe320f0c9989bc30c046a54068618f
-EBUILD plymouth-0.9.6_pre20211225.ebuild 2971 BLAKE2B 3445fbb4b78f1309332ee149e526e3a037b533ce6874933fcd3afa8b5bb9347e10c8c1e2fd2667a04f46ebff3295765c435d53fbd7a9ba94c26fa1e7adbeb472 SHA512 8193f9091fbb95f4771e08acc9cf7626be3b537af0e6f1276f01def003d45ac3f1c63db627a741b965abfc5510841950aafac4bdfe88a994174def0d1b6627de
+EBUILD plymouth-0.9.6_pre20211225.ebuild 2964 BLAKE2B 457a6def0224f2d532aeee8b0c3e5d74358783bc09258e82995ac40d5ad1a7887967eea325f9f76a83c23c1be673dac72fe6a395a1c5ca9aadaf964fc9dc69b9 SHA512 ea2e1cb875310fd2c6cba736517700a42a47d0eb10f5c901e02e8819904c5d8fed0ab4516c0e31790e20eb95ac85086c0ef599d562a913115f3e382c07e1520e
 EBUILD plymouth-9999.ebuild 2833 BLAKE2B 80536368b14223aef2a3bc29444dafe9e4a4f81067fecde31b5f703ba7f5de56304cf476613c75d942baf91dfcdfe44192d437f401acadd856083e9c8e079864 SHA512 2e86c5be326acd5d4fe974207a986f2822c6e2bac16dbd76a8e785277b3c854e6aa4f50ac51c6d5043e9e8a21d82acb849d0c73e3b4d2e5fc97fe48e288b62dd
 MISC metadata.xml 1077 BLAKE2B b8226140cc34ea498fb1792e89ed3976a54dbaf49989ec76900eb1619cf27a1a4568d88ff0d979d085286f197f6c125fb1dc6bcff294d94a979ba5816711f56e SHA512 6ed57ac55fa2011204c8bb1e2c41697c91bd89f30d272bf581d9c5cf8e387a4f26e958e46a0fa79bc802345c3053556d88da0b5999481b73f4ac0643a2c8f3c7
diff --git a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
index 6f1b09a81b37..0c17e6c5bc8b 100644
--- a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	PRE_RELEASE_SHA="5b91b9ed84cc91759c986634a4d64d474e6092cf"
 	SRC_URI="${SRC_URI} https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PRE_RELEASE_SHA}/${PN}-${PRE_RELEASE_SHA}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/${PN}-${PRE_RELEASE_SHA}"
 fi
 
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 60ff3638bd4b..eb43c44feebe 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,4 +1,7 @@
 AUX 249-libshared-static.patch 881 BLAKE2B 436aa658b7f24cafad5126c5ce867508639e876a35168fa834591646dfbff6c8132348d33298d47627e1497d41be2ed1b73c288a2c0d504d2687dbdbc3f8a38b SHA512 5bb94984cddc26f35bec6edd02c7574ebd851e45efe551454d4372174ba2bca86c92c7be71936ddce4c2792886395467354e976a6a1f6e1505e95ba464a9466f
+AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
 DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
+DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 EBUILD systemd-boot-249.6.ebuild 2821 BLAKE2B aea61338aa4403de38db6527c74074519817f77df1dd2f1737767de7cb93e7084af9c8d11f7ae919e29f2aedd7ca00223561ce48b35d43a6544fe9cd009f06ad SHA512 efca3f4fbd43623e5d8033e32e6004576edca8d6b548c11568898d2eae7aabd05134bca8caf9732bb848dfa74cfe247d920a7b24672f4bd7a673af6b25b8dffd
+EBUILD systemd-boot-249.9.ebuild 2862 BLAKE2B 2ebe2d513f74ab4abc9b29e61ffcdb1a905469425a50c1304200baf2ce50690cba183614c879d2c759db040022680c86728d021cd1e138e6eb1287b5a2fcbd7e SHA512 4f54e310315e560d89ee10e35295139d95f52e84b217f269c3a9d9bddc7a67f44f87dc5670116903a8de10218a0e68bd5695894c554dce03397a0de5da205b32
 MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8
diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch b/sys-boot/systemd-boot/files/249.9-cross-compile.patch
new file mode 100644
index 000000000000..e063d303c7d8
--- /dev/null
+++ b/sys-boot/systemd-boot/files/249.9-cross-compile.patch
@@ -0,0 +1,23 @@
+From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 21 Dec 2021 20:10:09 +0900
+Subject: [PATCH] meson: fix cross compiling
+
+(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02495d16c9..c76cab535d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
+ conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
+ conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
+ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
+-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>'))
++conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
+ 
+ decl_headers = '''
+ #include <uchar.h>
diff --git a/sys-boot/systemd-boot/systemd-boot-249.9.ebuild b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
new file mode 100644
index 000000000000..c0a51a5c2eee
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-249.9.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-any-r1 toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+if [[ ${PV} == *.* ]]; then
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> systemd-stable-${PV}.tar.gz"
+	S="${WORKDIR}/systemd-stable-${PV}"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	S="${WORKDIR}/systemd-${PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+RESTRICT="test"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	sys-devel/gettext
+	dev-util/gperf
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-boot/gnu-efi-3.0.2
+	sys-libs/libcap
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+PATCHES=(
+	"${FILESDIR}/249-libshared-static.patch"
+	"${FILESDIR}/249.9-cross-compile.patch"
+)
+
+src_configure() {
+	# https://bugs.gentoo.org/725794
+	tc-export OBJCOPY
+
+	local emesonargs=(
+		-Dblkid=true
+		-Defi=true
+		-Dgnu-efi=true
+		-Defi-cc="$(tc-getCC)"
+		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="/usr/$(get_libdir)"
+		-Dsplit-usr=true
+		-Drootprefix="${EPREFIX:-/}"
+
+		-Dacl=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbzip2=false
+		-Delfutils=false
+		-Dgcrypt=false
+		-Dgnutls=false
+		-Dkmod=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlz4=false
+		-Dmicrohttpd=false
+		-Dpam=false
+		-Dqrencode=false
+		-Dseccomp=false
+		-Dselinux=false
+		-Dxkbcommon=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+set_efi_arch() {
+	case "$(tc-arch)" in
+		amd64) efi_arch=x64 ;;
+		arm)   efi_arch=arm ;;
+		arm64) efi_arch=aa64 ;;
+		x86)   efi_arch=x86 ;;
+	esac
+}
+
+src_compile() {
+	local efi_arch
+	set_efi_arch
+	local targets=(
+		bootctl
+		man/bootctl.1
+		man/kernel-install.8
+		src/boot/efi/linux${efi_arch}.{efi,elf}.stub
+		src/boot/efi/systemd-boot${efi_arch}.efi
+	)
+	meson_src_compile "${targets[@]}"
+}
+
+src_install() {
+	local efi_arch
+	set_efi_arch
+	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+	exeinto usr/lib/kernel/install.d
+	doexe src/kernel-install/*.install
+	insinto usr/lib/systemd/boot/efi
+	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.{efi,elf}.stub,systemd-boot${efi_arch}.efi}
+	einstalldocs
+}
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index a320745811be..c27843711bf9 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -3,5 +3,5 @@ DIST woeusb-5.1.2.tar.gz 160660 BLAKE2B 86fd0581ea2524d61ef48d9adf633d350ae21484
 DIST woeusb-5.2.4.tar.gz 163043 BLAKE2B 101175b86d0798009a32b705bfd8e63597dd9a36dff3ce0afcdf72e26d3447ee898fdbf7c87b5f95bffde31736d5fb8c719484a47bf3c1bc0d91ee68a6a05573 SHA512 e44087ef4f0c69cb8378c6e398b3ae5e59f7f111442b3ef2d65f4bbf2dacab862c753f7afc10c9dbbf0541476ada218da3c0210cb569bb7edec606689a93ec0c
 EBUILD woeusb-3.3.1.ebuild 1047 BLAKE2B 53560251d0e8cc1a50bd04fc86e4022c7056ec411f7783255198f079d36d4e1c90c3e6980751decaa81ba85327aa22e72834ec0c938770134e811ca7e2e1741a SHA512 a8f12e189cd110e7d8e5f7fb9da13b53b2478f29d07e9aca11cfb5f142fc6ed792285a1b4a73dad47e2197ea265c5983d7ed3da56e96ff11e026a376d63bd037
 EBUILD woeusb-5.1.2-r1.ebuild 746 BLAKE2B e478d2847fc08226921a4b43ffb617e346d845155c5d84011236d9014792f6933e5e32ec66b17ab325d539c465221eb6c9a83c73a204f61043c5430c7ed3de2c SHA512 1efc9cbc1426c8591c9f127eaeed6093a70128adb77da174ff835f8aff02681aef9400ec136ad199ec23399255f69faa0aaa04149d4372a8392ca1b9e94df39c
-EBUILD woeusb-5.2.4.ebuild 748 BLAKE2B 1cea90984c3793b29f66ca62c8197dde0d6b929847ed1a6852e678fc4c25e414d18311299d94b2fba50126a5217cf470e13e6f0c7c2ea5bf101eecd633554f21 SHA512 458bea42c3e862d94e8d4fdd05cc7d83c13dc8f42f0e3b619b55c406b0fb6d08cee354e9fbf4a9bc770fc9fa96dcc0bae9dd8fc95049fe1b7f8e8294371d373d
+EBUILD woeusb-5.2.4.ebuild 746 BLAKE2B 4cce8a74fa3d6ec2b61f52b8b5ca7b42f7e441ba2448ca53e90842bd5555f68b3bb3184d832b6edce8af0b2e1c6a2f98f8560e4716e00d33595d3c90649ed70c SHA512 79b705d873f0c33d96945e5bc6a88ac9cfa07ff1bdb06af620e44a79904827a1aeb975d7c6bf694592d00cae036398d3d15bf4dc411c9a3ea4d759ab5171966d
 MISC metadata.xml 475 BLAKE2B b3c33f5d909ec487e5f5e659c4e74218a406be610319c1108803bc726d448096a50ea2a95607df6bdb96ac99b5883217cf69ce8331159cf9d65d8fcefc564090 SHA512 81683b4e8b4b4d539930c89ba2d64588ab3f3cc002d25bcfb589f2f4cb01a4474c462b0749a66d59e85aa743bc0b4760f5235a5c90f02f3fcf31d51b8ce6bf84
diff --git a/sys-boot/woeusb/woeusb-5.2.4.ebuild b/sys-boot/woeusb/woeusb-5.2.4.ebuild
index 4f1d25c96d02..84a8f2131b58 100644
--- a/sys-boot/woeusb/woeusb-5.2.4.ebuild
+++ b/sys-boot/woeusb/woeusb-5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}/WoeUSB-${PV}"
 
 LICENSE="CC-BY-SA-4.0 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/wimlib