gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 266 deletions

diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index cf5a78cec71b..c1945b39b523 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -2,11 +2,5 @@ AUX gnu-efi-3.0.6-ia64-gnu-hash.patch 4635 BLAKE2B b7e39832239e2a1be389fd6fa9e41
 AUX gnu-efi-3.0.6-ia64-setjmp.patch 3964 BLAKE2B 1475a5f188e86837303e1b91de3c37e06d95f67e8a67b8ddbc3d542df49791d9433601ca21f23c43fb57be98f68294385b2c2b0db67ce5f2b71eef55eee0adfe SHA512 146002da1ccb3a8d9b7430e52cafbf67c33691e0cbad443ef59ea6b7f604d04c82796c977977f64227c13d40d071eff8e0cb89f1d7d88d498fcc16871757b778
 AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af4840d0301c1fb590d34b029e18a239a232ecca6a62431e10138d4e12cb44a5f64b415936935c1bdaf601dcf605ebe892de54 SHA512 1f77f4a5dcd2f1589cd6950da3462f2508d0ac51c2d2268400414c336ddd41fcf430e79fb702fd5aa99cb4be0bf0fc6eabe9362d736a1223b1c53c2c0b319584
 DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b6f553ac0b2d8fdc83e49c69bec0dce1e2e8730705f70b3b7b0a61e4f065773667945ffc92a6f40eba381fcf6723 SHA512 1a6b06b69eb95e03c00fb1c476bf346ab2cb0ecca9a44e163f52f2aa4b9837d3dd2d3ed8b4ce77aaf32a66e49f826ea5b43a97c8c7c56aaa030bc20b3415122a
-DIST gnu-efi-3.0.3.tar.bz2 142229 BLAKE2B 5230e99358fc2c1a85fd56840a9ddbd4d1cb42d15a8c37dd44e87037e45a1033f1014c953b5a4d2bb565c4be5aa67a3982ca64e575aaae9c1ae64ce27659b642 SHA512 0b0582e22344ea8a544aba540b56dc36364febfeb5bb655e87277e638fd4e549214a0cd2079a852d15ee376cd51c33794f65a7efb23be9a7a929e889cd616c8c
-DIST gnu-efi-3.0.6.tar.bz2 152088 BLAKE2B 2cb1d72f6972a86e913fba28a86e95a1b0baf15251d8fa3d4c335a13e5fd929b61f8f421330acbddbc640efd63594713180b7fc3e623fda2397947538a25b795 SHA512 f1b17766d8ae000c0177ea2126d87883f254ab01ac020e4bfaa9ad2d3d60a66d07b6237d9842e5989c4da3fd23152b5c592ef863fdc9806901f43c43582a2258
-DIST gnu-efi-3.0.9.tar.bz2 154445 BLAKE2B 099af13ff8944d6d362fd4f1dfaf7eff477e7105298651295a63493eb54799459649a977b3b0600e9884b48f8119ecf1faa38d35e0b01086076de40beefbcbcc SHA512 1a775476fcbe354e57c9db258b1c6ad4346b84d1794178ab5d5195b3ffba250066ca4c42a553d5b2866fa1b4e03019d61df0197f269188c73297042990adf316
-EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2ca60a96eb76d5618d7421585708021a81926dcd46c66c70032e5164e00760625f064d207d065fd91788dc0945f5ae753f73776cfde43ddfc3ff797407801ebd SHA512 5856a713576cee8afa0ef279f0b876462a2bff1e8eaedd96e5d197b920cea19f686e92327fb8cf7d3db3f2f94c9011e1071fb864dd6903ff33c339e7d453e274
-EBUILD gnu-efi-3.0.3.ebuild 1732 BLAKE2B 9c453d8e28059d16832adaee14ba34baf6e1b6caaa54c279a91c48798ad00cc8da6ee4b6fb2aa02f06c0773d8c8ad17ed93e65168965e637d85a3f5251fbb31c SHA512 2b4cdc3cc522ed6d9c6a716756fec4009d52af85369c2be1c81cf6afd03dc78b7e836adb351427a0cd0656de8f5e19a287e093d985a68e15726721d58c2fb6ef
-EBUILD gnu-efi-3.0.6-r2.ebuild 1959 BLAKE2B 74364ba53da292593203a47af9d4960046a9b79291979b1d92ebbfe83a695a0821ceec67dabb0a53a823a78a34e04bd0680c7e87e44c336891a1a29f808dd38a SHA512 fa013637c4c044381f98f655232860e6eb2e0000a620b8499484fe99a94751cdace1a33182e26f7784c16f365cf21f6ee74ab1dbce7a1cb06f1ca9b8612354bc
-EBUILD gnu-efi-3.0.9.ebuild 1887 BLAKE2B c897a9466dd2884bd33ea1abe740b468d938a0f0844d713e34a8183b682b642c2cc969f5a6a67c3f619b1bc42ad6cf469be44e0407ce43a6f17733b797a5ad7b SHA512 9a2a75d2ee2c72ea190520e1c0e99d3cc7a6fee029b5ae522b64c844bbb1cde69dc0739034b92fedbe8babff4578e83291543e528ec506b9a58eb20e8d1488d3
+EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2970066312f081c9ab8ed47c7160516ff81623cddb409a186a7165632a61f58b96d2998caead7dcbdb2f6e0c79ac3a0ee39d2ca940358361841adfbcc990e58b SHA512 d708339e31740c150505ed11c9e1de707177717d14a8acf9c496969642b1a9c091120db3f70dc2baca45d94ae0c58f836966d5a5b30b989f19c6ff8dc03ba511
 MISC metadata.xml 446 BLAKE2B ed77ce0b04fab42aad08921e9365b866a3d64d5192a569ad161e0415a2bbe1e9b374a48e1b2357331cf9743fc082a22c6b68081bddaa6b783e5cc78c4df394c2 SHA512 114721b7dc26234a2bce0ab65f2513f5bdd4749fd8fc5beb9619dc449bde13c82c88716d3e9b94a192d4298019255fff1aa32beaa15b643490fdbc25e75d83f8
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
index 64106c2bc4bd..27742adc9b20 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ia64 x86"
+KEYWORDS="-* amd64 arm arm64 ~ia64 x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 
 # These objects get run early boot (i.e. not inside of Linux),
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
deleted file mode 100644
index cb255538dac5..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
-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"
-# IA64 build is broken in setjmp code:
-# https://sourceforge.net/p/gnu-efi/bugs/9/
-KEYWORDS="-* amd64 ~arm ~arm64 -ia64 x86"
-IUSE="abi_x86_32 abi_x86_64"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND=""
-
-# 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"
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD
-
-	# https://bugs.gentoo.org/607992
-	filter-mfpmath sse
-
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	dodoc README* ChangeLog
-}
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.6-r2.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.6-r2.ebuild
deleted file mode 100644
index 03f00a2ef8a7..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.6-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
-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 ~x86"
-IUSE="abi_x86_32 abi_x86_64 -custom-cflags"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND=""
-
-# 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}"/${P}-ia64-gnu-hash.patch
-	"${FILESDIR}"/${P}-ia64-setjmp.patch
-)
-
-src_prepare() {
-	sed -i -e "s/-Werror//" Make.defaults || die
-	default
-}
-
-efimake() {
-	local arch=
-	case ${CHOST} in
-		arm*) arch=arm ;;
-		aarch64*) arch=aarch64 ;;
-		ia64*) arch=ia64 ;;
-		i?86*) arch=ia32 ;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD
-
-	if use custom-cflags; then
-		# https://bugs.gentoo.org/607992
-		filter-mfpmath sse
-
-		# https://bugs.gentoo.org/619628
-		append-flags $(test-flags-CC -mno-avx)
-	else
-		unset CFLAGS CPPFLAGS LDFLAGS
-	fi
-
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	einstalldocs
-}
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
deleted file mode 100644
index 57a9ed662e5b..000000000000
--- a/sys-boot/gnu-efi/gnu-efi-3.0.9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2004-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Library for build EFI Applications"
-HOMEPAGE="http://gnu-efi.sourceforge.net/"
-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 ~x86"
-IUSE="abi_x86_32 abi_x86_64 custom-cflags"
-
-# 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.9-fix-clang-build.patch )
-
-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 ;;
-		x86_64*) arch=x86_64 ;;
-		*) die "Unknown CHOST" ;;
-	esac
-
-	local args=(
-		ARCH="${arch}"
-		HOSTCC="${BUILD_CC}"
-		CC="${CC}"
-		AS="${AS}"
-		LD="${LD}"
-		AR="${AR}"
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR='$(PREFIX)'/$(get_libdir)
-	)
-	emake -j1 "${args[@]}" "$@"
-}
-
-src_compile() {
-	tc-export BUILD_CC AR AS CC LD
-
-	if use custom-cflags; then
-		# https://bugs.gentoo.org/607992
-		filter-mfpmath sse
-
-		# https://bugs.gentoo.org/619628
-		append-flags $(test-flags-CC -mno-avx)
-	else
-		unset CFLAGS CPPFLAGS LDFLAGS
-	fi
-
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
-	else
-		efimake
-	fi
-}
-
-src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
-		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
-	else
-		efimake INSTALLROOT="${D}" install
-	fi
-	einstalldocs
-}