gentoo auto-resync : 23:04:2024 - 23:59:26

4 files changed, 90 insertions, 5 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 2743e21fc858..812b03742d1f 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 c7a6da50d3a5..b8735d6b9628 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -1,6 +1,8 @@
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 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
 EBUILD gnu-efi-3.0.15.ebuild 1910 BLAKE2B 0d868254cfffdb8a0ce07734991f8bac8d39a7ccf26377ad6479f88a2c91e9d1bb2ff41f10b85565fbfc97ff4b3deb1a391b53c63bf94768c40a8fcd230e8f14 SHA512 9abd0157e68f99c54e55f40e522532ec8dec27521947a15faf574246c6a428e0ef5e2c966045516f19eef7988b26528d7aac351d6180d521420e369aa200e7a4
 EBUILD gnu-efi-3.0.17.ebuild 1941 BLAKE2B 5d61373cd3009a5bc90ffa2df37cbdb5efbc7b7b5c581c41c53031df1aa20f5c4daa3c82d9bda3cdf306a591ce02f34cf8900d53fbcca5b1264c90cb75aa8763 SHA512 84e089cc02fab5fa8730dad2d08099a16517a968ca34cb8eed5c9d7f2da5a30a7bfedce941cb88f281d9932e3f845d9de9612004d3aa9507478c1424597b6a67
-MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6
+EBUILD gnu-efi-3.0.18.ebuild 1884 BLAKE2B 72232543d7c011763e97d252fa9db5527c4601ea55ad8e9b9f780ce77d8d08184a611a4cb82a17cce2111c8387b4e4d8dfe7fb966e7332b06343bf3bd093015e SHA512 06bf4f5eb626f695f9bde3ce1883812ebaa75a43a1eadaf34455f310692171447d76b4a94a59630693fdad1669f26f3399e373448aeb2e16580b1a2ed204efb4
+MISC metadata.xml 300 BLAKE2B 940e2ca5551c9b60b21fd08228c83c7037ba3248f96cdc2e289f0f729b622af4b88517410b6927292d5de777fecf7ad7610919ed218c17c27e8edec80d519e06 SHA512 5e6ef7a0054b0f19cedd0fcb6f07659d15bbe22902b482b6c43460143d8c25e5a4308812c70953b256f4d779ebd11515627032701ac7ab620f5e48080430a9f3
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18.ebuild
new file mode 100644
index 000000000000..fe16fd82ea2f
--- /dev/null
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.18.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2004-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Library for build EFI Applications"
+HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
+SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
+
+# 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 ~ia64 ~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 ) )
+"
+
+# 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"
+
+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
+
+	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/metadata.xml b/sys-boot/gnu-efi/metadata.xml
index cf2580c0e58c..40e0d4d4861a 100644
--- a/sys-boot/gnu-efi/metadata.xml
+++ b/sys-boot/gnu-efi/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gnu-efi</remote-id>
+		<remote-id type="github">ncroxon/gnu-efi</remote-id>
 	</upstream>
 </pkgmetadata>