gentoo auto-resync : 24:11:2024 - 03:02:54

10 files changed, 312 insertions, 13 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 964f2deea0eb..06c75fce1191 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index dfda1748232d..4129657f66df 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,10 +1,15 @@
 AUX gnu-efi-3.0.18-clang.patch 904 BLAKE2B dd7c2aed740e9ecfcd918ab4ce4ab05090792f7c77493dbd401b3a54aa966748bb4aaad44d5787125c5e931506b529e91829924822413f00ab2768ef78f37bdb SHA512 9464474ec0c945d2546549f78ab38e30eaf9108dcca2ece33c3c83b3ab3bc471c8cea08197c9ffb0fcd1aa45b8544e2e57d988ca05127e5dc0dc8e945d323033
 AUX gnu-efi-3.0.18-remove-linux-headers.patch 360 BLAKE2B 2000100455634cfc6244ac1a54e1318b37efc0e411f9780d520cff7d30524f0e61e2980f0067cc27450375745f948671b3e4b4674d87db6f6675f93b590570f0 SHA512 1eb9d2299fd078c5616bbb4e9323544ef70039992cc5262c1bf9e41f4f9c40de70ad4aee973e9d5d665a1b7cc2d2a6b721d13b17326af0cd7cd0b735a7fd8c7e
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
+AUX gnu-efi-4.0.0-remove-linux-headers.patch 321 BLAKE2B 0b03f44482f47316ca93ee0350a4b9132f2251dd78e6dc9e9e73bb941b9ae29fd770ac6131cd64632ecfd2d7c2dac60118f238308c846e26049b8b8a40af9e38 SHA512 df6456bf2b313f312860bc4282807694ccfb35c8d3ec325be4e9617e872a93893b4f7cc93d23aaa0433f599475617d796fed3d02c3e4bbd07d009e2d1a463308
 DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f
 DIST gnu-efi-3.0.17.tar.bz2 165568 BLAKE2B 27f8171b411a6a8a138d44d91c7e4e4291aa399562825d51a398913572119482ffeb303d7508ae13eacd2cd10b8f5098405ab16eb56243587efe93235f661285 SHA512 0893ca234272584f889b1ae1c75341a9ceee60acfd32765daa5d704191ba00450536a287b949304c6d055d1bf125cc29e24fc41df8e5230e0da4f9d944876512
 DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c30d42ee728b4c0c084258ed2f6f2099c068ec5841cee81ecf664dd658dee3b94d68324ebaa498cb49cec4f7f7df9 SHA512 39f9fa14b880441a94a04400ff8850efdd9474929e5501dfd05af06e7747b4d0f7cb742ac811c7026cf52d00508efb73018be4d61d63a1211de0cd931cbc473d
+DIST gnu-efi-3.0.19.tar.gz 218588 BLAKE2B 78db87904e644406ce2eb1a0ef0f325e7ad0f004dd56199e319985c5d035b4755d545c1a6bcf749da08c7670132de28a3e53ba059956b841034c6b059e39042b SHA512 78a79f51bd271043edbf534427d8fbba3d8099e831a9643019899453e8363ebd4d43f6e5448cdde31d43a6bdb94ec32e73425138bfb614617b8886df90fc1665
+DIST gnu-efi-4.0.0.tar.gz 228852 BLAKE2B 30a22785b43b586596e9b4cfd281815715529185fbfdb800947ee08a94b3dac80ee13e9f2a8f5cf4acc46b7844cef9e92de97e97801d085249dce3afb2b0fcf0 SHA512 737fda41a45a63ab652f3e8dd5c035bc40dd66e839218c33478fe2ce81346f004b1bed79a5ec29cc282f0d699ad21256e0915482a3fa04b880dea21cae9e2b7f
 EBUILD gnu-efi-3.0.15.ebuild 1917 BLAKE2B cd98c39082b4d0e8bdf2181738b81a115842eb303ec196569a5beff5212339b20f13ec62a6f4a31fa14db3cd3f3d9fd22c0d7ade1eec40e7eea87d1ea86a8193 SHA512 fb622477b316beb65ad1e187920ab75df0d646410f8e953971b8cff9e162b4a80ef911cde2b239faf0b196b5ecb14b3d4105429be3154949036ee921679e0b16
 EBUILD gnu-efi-3.0.17.ebuild 1948 BLAKE2B 6e9c1ea853cd12b47e60c25e889306698dbfba6cffb10fd7f7bac0ef3410d882559659d3f6f23f953d8c9071930a41875b0c75ca17b871bd3c852af891457dc3 SHA512 b5b46e15baca02080f3236ab796c8dfbed0c2cdf31593e9810304a9a853091492e47adb9429a7a82da6b50de5c6917f8a61a4588e78190d70af970d8126eb58e
 EBUILD gnu-efi-3.0.18-r5.ebuild 3827 BLAKE2B 6e0ece77587a2002480538f37d28e6c0f0b7fba3dc200b50cd556194483648cd63280ce746449989825b0452d172024f69516ce5acd950898a108c6f0ba7637c SHA512 56c8b1316a96e55dd1746cce68906d84720b6022c7f5d8ceb11d8d8ca56fae228c3d568b20db91414e207c90dafe926c8b8b31e2f4642b6bf5a9857206c9a04b
+EBUILD gnu-efi-3.0.19.ebuild 3855 BLAKE2B fefc43de8d62b4b9ab5759086fdb68bc89152108398a6070d3f87fdb367474b785e1dedff5aec668cdc0164c96ffb03151a6990240f638178862ac67466dcece SHA512 cf06eb9552d65539dc9895746d254acb7c53cfadd40b7f48e6e44adada3c72684d8bd99ae962c9852093ce00b4a426d07d021c4d5d1b4e3ccdd09c1e5784fc09
+EBUILD gnu-efi-4.0.0.ebuild 3847 BLAKE2B 12210280c50ce12ca55f53ee6ca9665d29a1411b0a32ca2c7a3d0fa86dc7b916c55755cbe4392d17acb5292ce6a60cd9e2fcf22fd689cdea4739c9640e13ee9d SHA512 25112154d3fc1dcf73b18d6e814fe54de2accecca96575eef48f94b7d05b65719bf52b7ea2170cb2150815919c3a65483465378d6fc571cced95bfbfa3a5a6f5
 MISC metadata.xml 381 BLAKE2B a3cbadc2ae97d29ac87c04f3209cd7f4879ef70903907f319b425f038f07fd6bbc357a0291e70909a3b0b2097de6b63daf0f568d0fd7097c7bd2d9c9c7f3a963 SHA512 abbdda69a47f94442977af7491596e40873767256f5e75c3c06b614a369ec8cb7103a132e77a95c99ba24e4b205e5c3fc267039c920c1268a19b17e4ac779b79
diff --git a/sys-boot/gnu-efi/files/gnu-efi-4.0.0-remove-linux-headers.patch b/sys-boot/gnu-efi/files/gnu-efi-4.0.0-remove-linux-headers.patch
new file mode 100644
index 000000000000..858200e3010f
--- /dev/null
+++ b/sys-boot/gnu-efi/files/gnu-efi-4.0.0-remove-linux-headers.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/888829
+
+--- a/apps/Makefile
++++ b/apps/Makefile
+@@ -41,9 +41,7 @@
+ 
+ include $(SRCDIR)/../Make.defaults
+ 
+-LINUX_HEADERS	= /usr/src/sys/build
+ APPSDIR		= $(LIBDIR)/gnuefi/apps
+-CPPFLAGS	+= -D__KERNEL__ -I$(LINUX_HEADERS)/include
+ 
+ ifneq ($(HAVE_EFI_OBJCOPY),)
+ ifeq ($(SYSTEM_HAS_EFI_OBJCOPY),0)
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
new file mode 100644
index 000000000000..ad0bc6c1ac36
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.19.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2004-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# inc/, lib/ dirs (README.efilib)
+# - BSD-2
+# gnuefi dir:
+# - BSD (3-cluase): crt0-efi-ia32.S
+# - GPL-2+ : setjmp_ia32.S
+LICENSE="GPL-2+ BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="abi_x86_32 abi_x86_64 custom-cflags"
+REQUIRED_USE="
+	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
+	x86? ( || ( abi_x86_32 abi_x86_64 ) )
+"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+# These objects get run early boot (i.e. not inside of Linux),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.18-clang.patch
+	"${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch
+)
+
+check_and_set_objcopy() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		# bug #931792
+		# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
+		tc-export OBJCOPY
+		OBJCOPY="${OBJCOPY/llvm-/}"
+		# Test OBJCOPY to see if it supports EFI targets, and return if it does
+		LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
+		# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
+		# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
+		# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
+		# so, we use the absolute path explicitly.
+		local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}"
+		if [[ -e "${binutils_objcopy}" ]]; then
+			OBJCOPY="${binutils_objcopy}"
+		fi
+		if ! use arm && ! use riscv; then
+			# bug #939338
+			# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le
+			# gnu-efi containes a workaround
+			LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
+		fi
+	fi
+}
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		tc-is-gcc || tc-is-clang || die "Unsupported compiler"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	check_and_set_objcopy
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Make.defaults || die
+}
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		riscv64*) arch=riscv64;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		OBJCOPY="${OBJCOPY}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD OBJCOPY
+
+	if ! use custom-cflags; then
+		unset CFLAGS CPPFLAGS LDFLAGS
+	fi
+
+	# work around musl: include first the compiler include dir, then the system one
+	# bug #933080, #938012
+	local CPPINCLUDEDIR
+	if tc-is-gcc; then
+		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include
+	elif tc-is-clang; then
+		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include
+	fi
+	append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include"
+
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild b/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild
new file mode 100644
index 000000000000..991d495bd8d8
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-4.0.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2004-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="https://github.com/ncroxon/gnu-efi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+# inc/, lib/ dirs (README.efilib)
+# - BSD-2
+# gnuefi dir:
+# - BSD (3-cluase): crt0-efi-ia32.S
+# - GPL-2+ : setjmp_ia32.S
+LICENSE="GPL-2+ BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="abi_x86_32 abi_x86_64 custom-cflags"
+REQUIRED_USE="
+	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
+	x86? ( || ( abi_x86_32 abi_x86_64 ) )
+"
+
+# for ld.bfd and objcopy
+BDEPEND="sys-devel/binutils"
+
+# These objects get run early boot (i.e. not inside of Linux),
+# so doing these QA checks on them doesn't make sense.
+QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
+RESTRICT="strip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0-remove-linux-headers.patch
+)
+
+DOCS="README* SECURITY* docs/*"
+
+check_and_set_objcopy() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		# bug #931792
+		# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
+		tc-export OBJCOPY
+		OBJCOPY="${OBJCOPY/llvm-/}"
+		# Test OBJCOPY to see if it supports EFI targets, and return if it does
+		LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
+		# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
+		# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
+		# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
+		# so, we use the absolute path explicitly.
+		local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}"
+		if [[ -e "${binutils_objcopy}" ]]; then
+			OBJCOPY="${binutils_objcopy}"
+		fi
+		if ! use arm && ! use riscv; then
+			# bug #939338
+			# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le
+			# gnu-efi containes a workaround
+			LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
+		fi
+	fi
+}
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		tc-is-gcc || tc-is-clang || die "Unsupported compiler"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	check_and_set_objcopy
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/-Werror//" Make.defaults || die
+}
+
+efimake() {
+	local arch=
+	case ${CHOST} in
+		arm*) arch=arm ;;
+		aarch64*) arch=aarch64 ;;
+		ia64*) arch=ia64 ;;
+		i?86*) arch=ia32 ;;
+		riscv64*) arch=riscv64;;
+		x86_64*) arch=x86_64 ;;
+		*) die "Unknown CHOST" ;;
+	esac
+
+	local args=(
+		ARCH="${arch}"
+		HOSTCC="${BUILD_CC}"
+		CC="${CC}"
+		AS="${AS}"
+		LD="${LD}"
+		AR="${AR}"
+		OBJCOPY="${OBJCOPY}"
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR='$(PREFIX)'/$(get_libdir)
+	)
+	emake -j1 "${args[@]}" "$@"
+}
+
+src_compile() {
+	tc-export BUILD_CC AR AS CC LD OBJCOPY
+
+	if ! use custom-cflags; then
+		unset CFLAGS CPPFLAGS LDFLAGS
+	fi
+
+	# work around musl: include first the compiler include dir, then the system one
+	# bug #933080, #938012
+	local CPPINCLUDEDIR
+	if tc-is-gcc; then
+		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-search-dirs 2> /dev/null | grep ^install: | cut -f2 -d' ')/include
+	elif tc-is-clang; then
+		CPPINCLUDEDIR=$(LC_ALL=C ${CC} -print-resource-dir 2> /dev/null)/include
+	fi
+	append-cflags "-nostdinc -isystem ${CPPINCLUDEDIR} -isystem ${ESYSROOT}/usr/include"
+
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
+	else
+		efimake
+	fi
+}
+
+src_install() {
+	if use amd64 || use x86; then
+		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
+	else
+		efimake INSTALLROOT="${D}" install
+	fi
+	einstalldocs
+}
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 6a3cf0b049a0..d7387dcc9601 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -7,6 +7,6 @@ AUX refind-sbat-gentoo-0.14.2.csv 246 BLAKE2B 75623624efe360288ef14bb09f9f024b0b
 DIST refind-src-0.14.0.2.tar.gz 4648958 BLAKE2B 02019ddb872ce44d2a2119902edebd633f925d49634e3bcc6bfb2c9dedb8ce213166909395a333d3a37e95c67720e31b1f5fcf25083801c17d645372aa54a06a SHA512 41c120c1afec37c508aa5c0ec09a6563c3047ef84932308c91701795b950431dfad17d25cf664039b490a302d475add98441b75f90ff71cadce41febedc68a9e
 DIST refind-src-0.14.2.tar.gz 4628173 BLAKE2B 987acb29d4d81c01db245cd8e1c9761072e34cf3dfaa3e4fa77e549ee2c1dc4c3f8cbd9218f42e4eb77478df3453095dba8b36324c289c6a10b81f1ecb202743 SHA512 76a52ed422ab3d431e6530fae4d13a51e8ed100568d4290207aaee87a84700b077bb79c4f4917027f5286de422954e1872fca288252ec756072d6c075b102e1e
 EBUILD refind-0.14.0.2-r1.ebuild 4199 BLAKE2B c9a33311b52c77032c3dbdbcb97a012345e5620071e1bb43766580699e3e680fdc0d627c379873a6ebdfd28ba3d6fd783c0916090dbd35890004881ea7b4a538 SHA512 51bf8fbd6973446c3ac4a307b9e0b0df55bd41f3f62cd5bd663a5d5c3d6db701bba439b82e1f539c62e851a598a01e369c196ccbe6a1f9c3bee6d833938855b8
-EBUILD refind-0.14.2-r2.ebuild 4650 BLAKE2B 50ebb913a9e5bbc0662a6d119ba90205b6d5c79cfc796f703994c8f2c8eff70662168da2439d575ac1cb51c8653ad64cfbcd3e321f772c46d5471e0e800f7998 SHA512 f605d24b805611e67d572d45e6ff5dc40982a9f320abfa9d076837f7a12cd3a8511a6dd9c0a7c357ae4a6a6bd41cb75cb9f767146a85fb08058beb11d0fe9908
-EBUILD refind-0.14.2-r3.ebuild 4696 BLAKE2B f1fd491acb1c683df79c119daeee114f8aec6f477634add73208ca095331ead26735a4a074c5edc81a2be0b4ec1bdb41140deb45c14ee3f13f19a16d2cbde64f SHA512 fd0c3869b1874a2757143e7da95a1b000de808002a2265be1e53748b3d87f505d0801b3e6b6b2daca9dfbd94783669fd5fe195f5e7a9a0930ff7707c6fd7e461
+EBUILD refind-0.14.2-r2.ebuild 4657 BLAKE2B 3096fbbc4e6395594e0df3c9bcae29cc62900dba667fb3b28864116aa47b09b229f987127d2fdb0ca236f66f9667aad88618f382fd7e40d81b4a8ebeb27c5d15 SHA512 1ba09b0af3601c1b0a444ccfa6b82cca9abf4425da8273aafb73a9a270e6811b20732239dc0767ddea11f994ef19ed53a0a200fdc12f0a420c99f9e6217e90a0
+EBUILD refind-0.14.2-r3.ebuild 4703 BLAKE2B c6f8c1a94bc7c2f0fb6cb2dc93dc53ce0c671977ef4f74d0817e305bd354cede150171ff62ea2208698dcc675c63ae4b62283aab97581a29b36f116c484b21cb SHA512 a0e1e2bce94c39886417e884925fd6ea13eab6ada8cd28e8938b7b967f957f3a75aad861fe9bdf49b2c608e6b775ae05934940259935b3162a10d88771b23e0a
 MISC metadata.xml 3809 BLAKE2B a2cf074c3c572fff3bdb1679b505cf3a9de4489acacdbc2b015fed91e7f37157fa7e3124438ad8af0788cc90f464b217c4fe05294c2c69ef637648cc68825885 SHA512 4b289982bbfda2697dd13b4c1fc020842a0fa06672e5d7f4b48cd39ef4348b1a17989686c55c96d220f682c8c95a340901fb3968d051aef8c8e5cf944bbcb4e4
diff --git a/sys-boot/refind/refind-0.14.2-r2.ebuild b/sys-boot/refind/refind-0.14.2-r2.ebuild
index 9897b9108ce3..85984c41cc6d 100644
--- a/sys-boot/refind/refind-0.14.2-r2.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 
-DEPEND="sys-boot/gnu-efi"
+DEPEND="<sys-boot/gnu-efi-4.0.0"
 
 # for ld.bfd and objcopy
 BDEPEND="sys-devel/binutils"
diff --git a/sys-boot/refind/refind-0.14.2-r3.ebuild b/sys-boot/refind/refind-0.14.2-r3.ebuild
index ee7c4a3ed0ca..1ae2bbe01929 100644
--- a/sys-boot/refind/refind-0.14.2-r3.ebuild
+++ b/sys-boot/refind/refind-0.14.2-r3.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} doc"
 
-DEPEND="sys-boot/gnu-efi"
+DEPEND="<sys-boot/gnu-efi-4.0.0"
 
 # for ld.bfd and objcopy
 BDEPEND="sys-devel/binutils"
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index c27843711bf9..d7afbdfa5e36 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -4,4 +4,4 @@ DIST woeusb-5.2.4.tar.gz 163043 BLAKE2B 101175b86d0798009a32b705bfd8e63597dd9a36
 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 746 BLAKE2B 4cce8a74fa3d6ec2b61f52b8b5ca7b42f7e441ba2448ca53e90842bd5555f68b3bb3184d832b6edce8af0b2e1c6a2f98f8560e4716e00d33595d3c90649ed70c SHA512 79b705d873f0c33d96945e5bc6a88ac9cfa07ff1bdb06af620e44a79904827a1aeb975d7c6bf694592d00cae036398d3d15bf4dc411c9a3ea4d759ab5171966d
-MISC metadata.xml 475 BLAKE2B b3c33f5d909ec487e5f5e659c4e74218a406be610319c1108803bc726d448096a50ea2a95607df6bdb96ac99b5883217cf69ce8331159cf9d65d8fcefc564090 SHA512 81683b4e8b4b4d539930c89ba2d64588ab3f3cc002d25bcfb589f2f4cb01a4474c462b0749a66d59e85aa743bc0b4760f5235a5c90f02f3fcf31d51b8ce6bf84
+MISC metadata.xml 246 BLAKE2B 20c337cf1c0dae7787d2951afb345cf082e87aac62f188939a6690fd3e0f5fff5a703c566003b77f893bdae8064ddb70e9f2271d064b76d3186c79c4a849488f SHA512 b101d331400a1aab0be2820086b2dbb7b561a79c8228665d3eb5d8f2ee977a45e330d905d7ab5e4bf9fd5478003fc7f73309a24bdc96ad75ea3d7d026e18f8e9
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
index 79a6fbb9aea2..8c8afcf15383 100644
--- a/sys-boot/woeusb/metadata.xml
+++ b/sys-boot/woeusb/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">WoeUSB/WoeUSB</remote-id>
 	</upstream>