gentoo resync : 05.12.2021

13 files changed, 262 insertions, 10 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index e8dc4b02c627..691235e7cb68 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 1b831ca7350a..10f149a66ee6 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -5,9 +5,13 @@ DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3eb
 DIST raspberrypi-firmware-1.20201201.tar.gz 189332299 BLAKE2B b3ec91f07b4713d26c29be5412d018a220129eef7ddf7c5c09d85e645c2c5754a95f13be7e690ab40648a982e3974cc760aa5b33c76612da836227d38c4ee3a5 SHA512 a7f4591552718956bd7f2d0d377234277e2e6f18cc9714ea30fe13f26d5ae1164b982f39dcf72ae4a18663369ef06d0187d8182713763262371c13107aac4c65
 DIST raspberrypi-firmware-1.20210108.tar.gz 189334002 BLAKE2B 254e8bf644b2b3773ff5ec9ffb47eeb84e0a149e9a74a18a9c6c39db03610fdd3a42f455a9e8935aa4afa4ee21ed098237d4a4e431c401a919c833372e729fa5 SHA512 3c8759e7d6cce597fcbab80e0cd9fd6d528ed2c956452e902f08509169181d703895298a71b8be76d6734f128f85e36d54a149ff9cd735ca44cf8416917ed172
 DIST raspberrypi-firmware-1.20210527.tar.gz 192247084 BLAKE2B 329707dfb2905b36926a3f0ecf1a8e3bc2b52e1a376f98ca7cfe9ec7b69d0fb370d8e23907f5bbd9ea75cf7fed5babd6fe54934919995dec6914e888d95e5fbe SHA512 5a48d1fae768c30528359a14371f59564447d2fb8a145cafa89d7d29352095c5b7ac33bfcbc8da494284c9d41e7dbafe4e863e8efd963a17ea6b6b9699b814a7
+DIST raspberrypi-firmware-1.20211029.tar.gz 193543221 BLAKE2B 308206d6bdfbe15bfe5f39cd230e6d4857f460744aafcbcc9eee6a74f05a3a9dc861e7c3e36baea46fdb1d1d1dc28b5edebf70bce3a3c085228b2ea321ef7a85 SHA512 7a1fe3b1645006c35fa49e842b9ece53b386ece42b8db99649de8d4bc0c19e34b0807767290e26422528606c5847843533aaa0edd0716e9f9f9dcae340a4dce0
+DIST raspberrypi-firmware-1.20211118.tar.gz 193544570 BLAKE2B db6c7c2e247f668b02210fb181305c3244f3d8a30f923656bf15cf418cb26822844df5b39af62b483e9e49405e13a60e57d6826aa0f3c3698920e8fc568656e2 SHA512 54881fc31ca0c9de8d8ca41ad6418e9d149975fbadbc0409f4136d4a31e70d743d55a16d4c0942305077d463c952edaa48be56d22d015983ab672dcaf5f134e2
 EBUILD raspberrypi-firmware-1.20201022.ebuild 1890 BLAKE2B 9753b9646bbc6fde102e179c085a640d655a9c1032fb92a5637fe54327e89d8f898071038c99cf7f013926f06f73795b2b5cab652838665b4a1c368459121cb3 SHA512 2bb448d45c08f68d284eb54ad2bf15e6f5b77dda2b75dbe45ae1a75476177f723336774fbe6e0956419b2822661a33db80692dcd8656b2efbb3c64e535065043
 EBUILD raspberrypi-firmware-1.20201201.ebuild 1889 BLAKE2B 9c3cc2d75c0f119a18ac174ed0bf5ca0228917e66a61bbd4a03a340693f31965c513b4de54b6d2dfba12372b387de79034943b96037dc2ecbe987f0f59fc48ae SHA512 cb9b623cece6312cfe8a22af7398ac7f1e5ce187581f7dbb4b7a878c1b9234194d7129faeb59bf34e3456b7a6e6e949bac3dcdf8d22560d262765f46b3a9a39f
 EBUILD raspberrypi-firmware-1.20210108.ebuild 1889 BLAKE2B 9c3cc2d75c0f119a18ac174ed0bf5ca0228917e66a61bbd4a03a340693f31965c513b4de54b6d2dfba12372b387de79034943b96037dc2ecbe987f0f59fc48ae SHA512 cb9b623cece6312cfe8a22af7398ac7f1e5ce187581f7dbb4b7a878c1b9234194d7129faeb59bf34e3456b7a6e6e949bac3dcdf8d22560d262765f46b3a9a39f
 EBUILD raspberrypi-firmware-1.20210527.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
+EBUILD raspberrypi-firmware-1.20211029.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
+EBUILD raspberrypi-firmware-1.20211118.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
 EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
 MISC metadata.xml 325 BLAKE2B 4f9cf3610ce1a44da9fc78b78b9df541c76d2b76da0e040f666579bce00f5ab5cf8aec4ee4921b50d5a3cd249ee857faa39d9f780e8fd42a57506c5f6dde3dbe SHA512 529fe413c16257c123c53c2e09cdc457b9481acc1b85cb76458a6b34fa1424cfa76807d72a298beba20d99349c1a9e224bd8f29af96ec9d14cabe6029dc82c44
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211029.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211029.ebuild
new file mode 100644
index 000000000000..263276be82c7
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211029.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211118.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211118.ebuild
new file mode 100644
index 000000000000..263276be82c7
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20211118.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index ff37d51083ca..f1f9147a39bc 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,9 +1,10 @@
 AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3996af18eda54c1514e2129a1e28f0bca7384b1f4b78e19e8b35e07e816a23cc04a93ba2804214d0 SHA512 51c0552984791190fc44159de1797094dffc01cf6ef90a3219b069ae2417c0ff5020a19b34d26b0c3f7d1a1bc9184078948f669a4186893561833ff88afdb316
 AUX refind-0.12.0-gcc10.patch 321 BLAKE2B 35cb0676fa14218eb90753481cb3f76718b71b8311b4df1a9bbf1ebe591d8a9bb06d68210c422266640771a84d80805274a2008fd454f417bbb4137b96003205 SHA512 38f679759698c23927d9c3934ffbb1ef26ca590b5b6103927ec9816f9f4b5f9745703ced94f1b357d9b47b84b3b8b8072ead507acedb576e7f4eed0c1834dee6
+AUX refind-0.13.2-gnuefi-3.0.14.patch 2031 BLAKE2B f70d92f26eab16baaa58ffeee1294eae5833243c26ca4b22f69d41d03fcab0a11b820de6e63c3b43171e16cd5b03688b9056ecddbb89305b0d9ce69a0abca02a SHA512 9bf3fe0413fc8d9a6a3878f786cc477127fb83e8abc306c91ea26437816e662ff46d0af363296d47596e1af82b3570b070c863d57a292941da41ca31a58dca0a
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db SHA512 529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
 DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 52a388dc1e57232d120b745e3089bad0d12265dd7718589cc7af9a8a1defa105bb74d01f76510bcaafbcb64f435b3e4a555c64d2c4538ae3cd56027b769a36db SHA512 b17c07d927462adae1b9644bdfd53d3ab58e193f02e54b45c50cbc9f100adca01d97631aeb85c014069733e11645af47b275fa2cef65b73ebd9c39a1ab40f96c
 EBUILD refind-0.12.0-r1.ebuild 3719 BLAKE2B ca10b2ea88821c597c58b1a801d96e811088ce36b01128b6a4e1719c71b3cdb228580f0399a963a7db09fc02d4ea01d613ab51d60547388e531d101cbead8500 SHA512 9a3a367c466c82d5e92cb0a6ec52d19660db06e88a1bcf73bd12ef43dc4fd5fa4a6381f5c03e2d3a28f1c558789fc85de8b5a0d622d11079dcbc22b707370422
-EBUILD refind-0.13.2.ebuild 3681 BLAKE2B 02c38930e9713e30cd24be065dbf5c795612ad90ea6d5ec34c022d354e2621c1cadecedba210c04189fb03d5c6fd461f7e20b7dc2e371038b9c8c2c196192d20 SHA512 f5e9d4309fecae4f5e9868c37759bb815298c11b56c1fa73227122c4816fee0ca979c672e8f31d67cd29e7aa1148d91dab1249a756c4472da24a3ed6341140c0
+EBUILD refind-0.13.2.ebuild 3734 BLAKE2B 6ad34a3f248908f7854b9eed3dea12c1c9e3b65f250c08577aacd14c4d61d7127bd166781b75c9fbbb1021703ab5c42f361b24fcb7c8299471a5be5e0ad5d1dc SHA512 d4fe0a9d74f199d7a371c2e9ad8f5650d7efbc497fb0f34a5d5924c8786924005408b61a246a8ab408c22e590e5b40d95ad455fee99303f13f9ed93a4f17feb8
 MISC metadata.xml 3852 BLAKE2B 5c6a075b5130fe3f3991350f694d9bf0b72c0e5eaad0a52daa15a0cd463b9105df04a4f59f539303daabbc58fa48a3c1190974b3df5fc71b27e0c493f5374274 SHA512 ada8758c6ec63943c1fb6b42430a87e8f78811fbfc4f39e5d6d8db8e2e2559782531dd17eb57fef588bc530b41735d1d8b44b8ebf6d7c992661329fa4357d637
diff --git a/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch b/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch
new file mode 100644
index 000000000000..751a8e838dfa
--- /dev/null
+++ b/sys-boot/refind/files/refind-0.13.2-gnuefi-3.0.14.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/810907
+https://sources.debian.org/patches/refind/0.13.2-1/gnu-efi.patch/
+
+Origin: https://sourceforge.net/p/refind/code/ci/10f838a4cd132a5595acaf3c54c15782151a61df
+Applied-Upstream: 0.13.3
+From 10f838a4cd132a5595acaf3c54c15782151a61df Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Sat, 23 Oct 2021 10:17:23 -0400
+Subject: [PATCH] Fix compile problems with recent GNU-EFI versions
+
+---
+ EfiLib/DevicePathUtilities.h | 13 -------------
+ EfiLib/gnuefi-helper.c       |  1 -
+ NEWS.txt                     |  3 +++
+ include/version.h            |  2 +-
+ 4 files changed, 4 insertions(+), 15 deletions(-)
+
+diff --git a/EfiLib/DevicePathUtilities.h b/EfiLib/DevicePathUtilities.h
+index b559671..14ed797 100644
+--- a/EfiLib/DevicePathUtilities.h
++++ b/EfiLib/DevicePathUtilities.h
+@@ -217,17 +217,4 @@ EFIAPI
+ --*/

+ ;

+ 

+-typedef struct {

+-  EFI_DEVICE_PATH_UTILS_GET_DEVICE_PATH_SIZE GetDevicePathSize;

+-  EFI_DEVICE_PATH_UTILS_DUP_DEVICE_PATH      DuplicateDevicePath;

+-  EFI_DEVICE_PATH_UTILS_APPEND_PATH          AppendDevicePath;

+-  EFI_DEVICE_PATH_UTILS_APPEND_NODE          AppendDeviceNode;

+-  EFI_DEVICE_PATH_UTILS_APPEND_INSTANCE      AppendDevicePathInstance;

+-  EFI_DEVICE_PATH_UTILS_GET_NEXT_INSTANCE    GetNextDevicePathInstance;

+-  EFI_DEVICE_PATH_UTILS_IS_MULTI_INSTANCE    IsDevicePathMultiInstance;

+-  EFI_DEVICE_PATH_UTILS_CREATE_NODE          CreateDeviceNode;

+-} EFI_DEVICE_PATH_UTILITIES_PROTOCOL;

+-

+-extern EFI_GUID gEfiDevicePathUtilitiesProtocolGuid;

+-

+ #endif

+diff --git a/EfiLib/gnuefi-helper.c b/EfiLib/gnuefi-helper.c
+index 246c261..8730403 100644
+--- a/EfiLib/gnuefi-helper.c
++++ b/EfiLib/gnuefi-helper.c
+@@ -20,7 +20,6 @@
+ #include "refit_call_wrapper.h"
+ #include "LegacyBios.h"
+ 
+-EFI_GUID gEfiDevicePathUtilitiesProtocolGuid = { 0x09576E91, 0x6D3F, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }};
+ EFI_GUID gEfiLegacyBiosProtocolGuid = { 0xdb9a1e3d, 0x45cb, 0x4abb, { 0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d }};
+ 
+ /**
diff --git a/sys-boot/refind/refind-0.13.2.ebuild b/sys-boot/refind/refind-0.13.2.ebuild
index 6ac73e61dca8..ce3ba933229e 100644
--- a/sys-boot/refind/refind-0.13.2.ebuild
+++ b/sys-boot/refind/refind-0.13.2.ebuild
@@ -19,6 +19,10 @@ DEPEND="sys-boot/gnu-efi"
 
 DOCS=( README.txt )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gnuefi-3.0.14.patch
+)
+
 pkg_pretend() {
 	if use custom-cflags; then
 		ewarn
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 53b2e3bda122..60ff3638bd4b 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,4 +1,4 @@
 AUX 249-libshared-static.patch 881 BLAKE2B 436aa658b7f24cafad5126c5ce867508639e876a35168fa834591646dfbff6c8132348d33298d47627e1497d41be2ed1b73c288a2c0d504d2687dbdbc3f8a38b SHA512 5bb94984cddc26f35bec6edd02c7574ebd851e45efe551454d4372174ba2bca86c92c7be71936ddce4c2792886395467354e976a6a1f6e1505e95ba464a9466f
-DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-EBUILD systemd-boot-249.ebuild 2641 BLAKE2B d5a14dba84ed7b88689fa12066c89c853421867e4949eb0d3147318035a1b3b1391f68a36c280f1e0e512b1b9fb9827a739d8edfc4444ea023f200f6fac23a70 SHA512 4fdb2244f6c7612e1cb56c69501ecf959f772c5fd3a958048917da7c76f569870f808cdb2691ff814e8966d4ed79ca829ead82c8e0250b450db29473a4b126f3
+DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
+EBUILD systemd-boot-249.6.ebuild 2821 BLAKE2B aea61338aa4403de38db6527c74074519817f77df1dd2f1737767de7cb93e7084af9c8d11f7ae919e29f2aedd7ca00223561ce48b35d43a6544fe9cd009f06ad SHA512 efca3f4fbd43623e5d8033e32e6004576edca8d6b548c11568898d2eae7aabd05134bca8caf9732bb848dfa74cfe247d920a7b24672f4bd7a673af6b25b8dffd
 MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8
diff --git a/sys-boot/systemd-boot/systemd-boot-249.ebuild b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
index d9ed991ef5c6..8ae443c2d75f 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
@@ -8,7 +8,13 @@ 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/"
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+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"
@@ -46,8 +52,6 @@ RDEPEND="${COMMON_DEPEND}
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
-S="${WORKDIR}/systemd-${PV}"
-
 PATCHES=(
 	"${FILESDIR}/249-libshared-static.patch"
 )
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 8212bc031e92..a320745811be 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,5 +1,7 @@
 DIST woeusb-3.3.1.tar.gz 386399 BLAKE2B 1423ecca39018c674b0eea36de732f54cfcdd14b8cc465e6d3c0639192cbd8355436b7a39ba453b19fa6f1c5b1f6938ef12f49710bc2a4af0f2eaed967e03ce7 SHA512 e3460efabaee199eb5ffc73ca99fe2d9141ed3a5f72acd2f8910b093b2b3a93928ee4eeb27d634293448f036101d8bf24aef65dc338c80e6e3e1738004594d52
 DIST woeusb-5.1.2.tar.gz 160660 BLAKE2B 86fd0581ea2524d61ef48d9adf633d350ae214842ee8f26c2937f312fce864fa188fb40dd35e8e9b15c3eef46869f0099ee005e3c49fc219486d006357f74f09 SHA512 ee1341cdcaf203e4c5007e3ac19deb0b3bbee9e7eeb5ca9a74742d107b1b3e77e5b938d2f7de9ce23b7fba51d6a266ea26fb221300613c1c4c8d0cd4f8299f8b
+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 748 BLAKE2B 1cea90984c3793b29f66ca62c8197dde0d6b929847ed1a6852e678fc4c25e414d18311299d94b2fba50126a5217cf470e13e6f0c7c2ea5bf101eecd633554f21 SHA512 458bea42c3e862d94e8d4fdd05cc7d83c13dc8f42f0e3b619b55c406b0fb6d08cee354e9fbf4a9bc770fc9fa96dcc0bae9dd8fc95049fe1b7f8e8294371d373d
-MISC metadata.xml 246 BLAKE2B 20c337cf1c0dae7787d2951afb345cf082e87aac62f188939a6690fd3e0f5fff5a703c566003b77f893bdae8064ddb70e9f2271d064b76d3186c79c4a849488f SHA512 b101d331400a1aab0be2820086b2dbb7b561a79c8228665d3eb5d8f2ee977a45e330d905d7ab5e4bf9fd5478003fc7f73309a24bdc96ad75ea3d7d026e18f8e9
+EBUILD woeusb-5.1.2-r1.ebuild 746 BLAKE2B e478d2847fc08226921a4b43ffb617e346d845155c5d84011236d9014792f6933e5e32ec66b17ab325d539c465221eb6c9a83c73a204f61043c5430c7ed3de2c SHA512 1efc9cbc1426c8591c9f127eaeed6093a70128adb77da174ff835f8aff02681aef9400ec136ad199ec23399255f69faa0aaa04149d4372a8392ca1b9e94df39c
+EBUILD woeusb-5.2.4.ebuild 748 BLAKE2B 1cea90984c3793b29f66ca62c8197dde0d6b929847ed1a6852e678fc4c25e414d18311299d94b2fba50126a5217cf470e13e6f0c7c2ea5bf101eecd633554f21 SHA512 458bea42c3e862d94e8d4fdd05cc7d83c13dc8f42f0e3b619b55c406b0fb6d08cee354e9fbf4a9bc770fc9fa96dcc0bae9dd8fc95049fe1b7f8e8294371d373d
+MISC metadata.xml 475 BLAKE2B b3c33f5d909ec487e5f5e659c4e74218a406be610319c1108803bc726d448096a50ea2a95607df6bdb96ac99b5883217cf69ce8331159cf9d65d8fcefc564090 SHA512 81683b4e8b4b4d539930c89ba2d64588ab3f3cc002d25bcfb589f2f4cb01a4474c462b0749a66d59e85aa743bc0b4760f5235a5c90f02f3fcf31d51b8ce6bf84
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
index 8c8afcf15383..79a6fbb9aea2 100644
--- a/sys-boot/woeusb/metadata.xml
+++ b/sys-boot/woeusb/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>petrus.zy.07@gmail.com</email>
+		<name>Petrus Zhao</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">WoeUSB/WoeUSB</remote-id>
 	</upstream>
diff --git a/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild b/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
index 4f1d25c96d02..880f376f6148 100644
--- a/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
+++ b/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
@@ -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
diff --git a/sys-boot/woeusb/woeusb-5.2.4.ebuild b/sys-boot/woeusb/woeusb-5.2.4.ebuild
new file mode 100644
index 000000000000..4f1d25c96d02
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-5.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Creates windows installer on usb media from an iso image"
+HOMEPAGE="https://github.com/WoeUSB/WoeUSB"
+SRC_URI="https://github.com/WoeUSB/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/WoeUSB-${PV}"
+
+LICENSE="CC-BY-SA-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/wimlib
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/grub:2[grub_platforms_pc]
+	sys-fs/dosfstools
+	sys-fs/ntfs3g"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i "s/@@WOEUSB_VERSION@@/${PV}/" sbin/${PN} share/man/man1/${PN}.1 || die
+}
+
+src_install() {
+	dosbin sbin/${PN}
+	doman share/man/man1/${PN}.1
+
+	einstalldocs
+}