gentoo resync : 02.08.2019

6 files changed, 23 insertions, 230 deletions

diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 036a69d718e5..55e0ba68fb2c 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -1,11 +1,7 @@
-AUX ipxe-1.0.0_p20130925-git-version.patch 1344 BLAKE2B b720d1a0f12a1b13e3b05406229c12426ac710be6bb42abfceb720415ea4b8b6a71d22155c908f7fa1b664aaafd3f90610d0724e5f52c625b37c8853e6a34703 SHA512 f52e90d590555678429d28e8d25f4023f2152b314d8d7f7d5c3774993253999d655a1b69f4d0b1320f82497f72bba566185c811e11ceca4e4920d7486b723ddd
-AUX ipxe-1.0.0_p20130925-no-pie.patch 1059 BLAKE2B a7c28d556db0fae9acb8c3ba83dc0f9b003cfcba3ec06f7207e8bfd155e608916cdb24849bfa65552b16a5a1e3a9f20981d2cfbfaec6527663ca38d6f8e2645a SHA512 98f7fb065068c1bbd6275ae08d826fef307d5541d9d73f0d695068c651cfebf926f9089ad28239235b31adad0a0cbcdb43380ba1fbfc12482985fe9f13acae7d
-AUX ipxe-1.0.0_p20160620-no-pie.patch 1053 BLAKE2B 20c091982e0e2d4bb8838df56c89d1eb2e6bafd6336a2f1d84b5b19568a7e97f0d038336184f873249957faa36c53e5f6a3dacafd45456885b4b0284d8ba51f1 SHA512 baace4f9b0d3a2b280beacf742c9bbbe8b276c79f13e46c3e6d1d63727da28816bb4bbc19f83306a5939ba7a22c29dca0ba4d80e47ace9b0c151db524076afe9
-DIST ipxe-1.0.0_p20130925-cba22d3.tar.bz2 2240189 BLAKE2B 58717ca43ece4ffbe8f68cae2f409c4cd8f1d3c2149521c28db017d4fcd31b6122fa35b9a476d3dc865baba0d2768744f4977420fb6410f1b09dad9170c32497 SHA512 a098d3fc0f68067be281b9c3654bb1b0be1b9d397327b55b36b17e69faf03ce6117d0278552c06990a5020e4ece7acac168d975b3c7bfce3b6865dea1fd1d8dd
-DIST ipxe-1.0.0_p20160620-694c18a.tar.bz2 2839663 BLAKE2B ec6999f3bcaf198f4b73464ee34456b923d0be26f11980e3020dd66012ddbf1b721aebb1c74c4289a0012e2ffae96a54a25821a4c7c621f727e090d13de58213 SHA512 67657dabe09f497c270cca16391669c89032112c1496b54009e2f1e8a477904d758476d4e465973aa0b6fc764be48ed6421607189aaea76e23fa0da6e9c8add5
 DIST ipxe-1.0.0_p20180211-546dd51-bin.tar.xz 1748228 BLAKE2B 5ed2ce71c7dbc41d5cbef6e263abd230b9831c945a8edb33a29d408bd4262e370a2f73c8d2eb3cb20e08c61ece83af1fb1bb4c5694098cb29c44628dbd18def8 SHA512 af2778c925a6e4c374ddae85f3db983c83e7a4e5bb2cf35e356d277b87d4c89bf63cc2c061ec31d608ff2160c13297232fa131da2b9dd0b580d93e1b0efd6532
 DIST ipxe-1.0.0_p20180211-546dd51.tar.bz2 2954305 BLAKE2B 8232b1afe017ff5d0389534e4efea3209ea0330d66e4d3d429abf81da66639b19488911d85bf2da200ff8cb0d49c5dda438074c4538303335419ea080ef80a16 SHA512 45d7f80f15a1c5ff1daa31b132065d38013a51127795ad81308b468940a455edcb40cde7601475039a7c977d732817203bbc627c642d3d10146a480da603f1dd
-EBUILD ipxe-1.0.0_p20130925.ebuild 2532 BLAKE2B 99bd848b672ede6a8d3d3cb4cd55ea5e5c3afd32d8ad56996edceff18ba10f4440640c2c91ec8a99ec3fdbb37f28705c0408733023c4b0aad977642c67850835 SHA512 d58eb5fc8dd50c2822474f07a7060f0bbff77c3ad815a0358503db365ee7c5e1d0b5f45da42a6a6653acd24537872ecfe3060e344681e6e65f3098ef409ad937
-EBUILD ipxe-1.0.0_p20160620.ebuild 2658 BLAKE2B 4757557957cfd0bdaed6dcf76b5c4dc89632881e51912ff824133806610b4e74551524ac0ef99115f381b043870d1f2cf0e38201f81994fdfc3d93195f4be12d SHA512 582abace1b57854b49d326fc88ec9e066d7ca287964f16c2f65f3a4b853ae65fd63aaf8f47d85adab4a71cf39be794eedb8452cc5380850dd4a19808bdf908d8
+DIST ipxe-1.0.0_p20190728-a4f8c6e-bin.tar.xz 1839688 BLAKE2B b28772b928690646e1b0cb1c27ef56e2cb1c0637a43c6174dea7c8ca401d8c8819938fa358a0bed5d57b8cf992b8c2060b52e32a970ef813f1cf705fb0805beb SHA512 1e5838b8c530257dc544f6e25f80e6e223480917db393ca3ff8c577f07e60180e18f2eed4e71f7b1965157d6e7001f65e224d3c8b56a98f84739e2504ca38985
+DIST ipxe-1.0.0_p20190728-a4f8c6e.tar.bz2 2985776 BLAKE2B 5a85505404978d51f80e30332f6eb0417d6d97eb9b3bc05eec5ad649c446c7d17dc841f8cd34a1b29c31dc6f5cf08baa69191de9c8dd4bcdb098c5d7f13a7824 SHA512 3af0da9058b39966bfd8f9d7dfe518ae7b26e18f58d1a3fa2cba8922ec3c50775b82dd9f23bf51be3ca3f69b705f92bcf80988a1817b30f7ab1826a4b159c5a6
 EBUILD ipxe-1.0.0_p20180211.ebuild 2804 BLAKE2B b1aaf4b606d62fdc12fcacbb5917ef0ba11e82b9e31b9d6b5f4a703e5cbc959a915847aadea45c031974821a2c7a5ab8d500a6f8d41fc438fdef99325afc8d0a SHA512 9bbdabfc8f6809c75080520052b570c996932280c0f41cc913f11e86d600a4e68af5cd61e28db243158887cfe830f6b3fdcf16046cc2307222db12a301be9b30
+EBUILD ipxe-1.0.0_p20190728.ebuild 2803 BLAKE2B ebb5fd6717e9fb5aba382ea0fcf15c1d5b478b5592de2809468496621b3f7abb4f57da72422466ae82a65c81fe9128ffa862f9df6a2c3c2336c5768a06d18a4e SHA512 cd59abef29be47d91af1eedf838cc7f34f1cb8d923cdb85d785a93bc0ffa59b81a482862283a20fcbe8eaa7a5e7bb3353b343f8188e2b0bb3c706a0345a6ed3b
 MISC metadata.xml 996 BLAKE2B 41f19340003c0213578fb1b3f7ae6aaff718eb150cdb398b463e695dcc931da45251ab5d70fbdff0277f52ad7a231f93f878d9fa4ce9fe5a338cc3d4e2708124 SHA512 123f401010d157b928390599a3125c9c18ba721757a16ac3fcce4fe30e3ff298ad9a3dcda64b779bf2fe0fcb52c9057e382b7ac618a3ae27b92dd94cf0dde0d7
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
deleted file mode 100644
index a981abdd892e..000000000000
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-git-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6153c09c41034250408f3596555fcaae715da46c Mon Sep 17 00:00:00 2001
-From: Florian Schmaus <flo@geekplace.eu>
-Date: Mon, 28 Jul 2014 16:47:48 +0100
-Subject: [PATCH] [build] Set GITVERSION only if there is a git repository
-
-The $(BIN)/version.%.o target will fail if iPXE is built within a
-non-git repository, e.g. when the user downloaded and extracted an
-archive containing iPXE sources, *and* if any parent directory of the
-iPXE sources is a git repository (or even contains a directory named
-".git").  This is because git will by default ascend the directory
-tree and look for ".git".
-
-The problem typically manifests on source based distributions, see for
-example https://bugs.gentoo.org/show_bug.cgi?id=482804
-
-Modified-by: Michael Brown <mcb30@ipxe.org>
-Signed-off-by: Michael Brown <mcb30@ipxe.org>
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 22a7335..c6760ee 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -190,8 +190,8 @@ VERSION_PATCH	= 0
- EXTRAVERSION	= +
- MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
- VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
-+ifneq ($(wildcard ../.git),)
- GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null)
--ifneq ($(GITVERSION),)
- VERSION		+= ($(GITVERSION))
- endif
- version :
--- 
-2.3.2
-
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
deleted file mode 100644
index 3156f3d11700..000000000000
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20130925-no-pie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/585752
-
-From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 00:47:32 -0400
-Subject: [PATCH] [build] fix PIE disable flag
-
-The flag is "-no-pie", not "-nopie".
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/arch/i386/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
-index fe3adc9ce436..59ad25b6e0af 100644
---- a/src/Makefile.housekeeping
-+++ b/src/Makefile.housekeeping
-@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
- # output on stderr instead of checking the exit status.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-+PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
-+PIE_FLAGS := $(shell $(PIE_TEST))
- WORKAROUND_CFLAGS += $(PIE_FLAGS)
- endif
- 
--- 
-2.8.2
-
diff --git a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch b/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
deleted file mode 100644
index a0501d187904..000000000000
--- a/sys-firmware/ipxe/files/ipxe-1.0.0_p20160620-no-pie.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/585752
-
-From cea213034635e4d765b2f362057b696febbe509f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 00:47:32 -0400
-Subject: [PATCH] [build] fix PIE disable flag
-
-The flag is "-no-pie", not "-nopie".
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/arch/i386/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
-index fe3adc9ce436..59ad25b6e0af 100644
---- a/src/arch/i386/Makefile
-+++ b/src/arch/i386/Makefile
-@@ -75,8 +75,8 @@ CFLAGS			+= -Ui386
- # output on stderr instead of checking the exit status.
- #
- ifeq ($(CCTYPE),gcc)
--PIE_TEST = [ -z "`$(CC) -fno-PIE -nopie -x c -c /dev/null -o /dev/null 2>&1`" ]
--PIE_FLAGS := $(shell $(PIE_TEST) && $(ECHO) '-fno-PIE -nopie')
-+PIE_TEST = for f in -nopie -no-pie; do [ -z "`$(CC) -fno-PIE $$f -x c -c /dev/null -o /dev/null 2>&1`" ] && $(ECHO) -fno-PIE $$f; done
-+PIE_FLAGS := $(shell $(PIE_TEST))
- WORKAROUND_CFLAGS += $(PIE_FLAGS)
- endif
- 
--- 
-2.8.2
-
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
deleted file mode 100644
index 574ffdf1986b..000000000000
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20130925.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils savedconfig
-
-GIT_REV="cba22d36b77da53890bd65fdadd0e63925687af0"
-GIT_SHORT="cba22d3"
-
-DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org"
-SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
-
-DEPEND="dev-lang/perl
-	sys-libs/zlib
-	iso? (
-		sys-boot/syslinux
-		virtual/cdrtools
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-git-version.patch #482804
-	epatch "${FILESDIR}"/${P}-no-pie.patch #585752
-}
-
-src_configure() {
-	cat <<-EOF > "${S}"/config/local/general.h
-#undef BANNER_TIMEOUT
-#define BANNER_TIMEOUT 0
-EOF
-
-	use ipv6 && echo "#define NET_PROTO_IPV6" >> "${S}"/config/local/general.h
-
-	if use vmware; then
-		cat <<-EOF >> "${S}"/config/local/general.h
-#define VMWARE_SETTINGS
-#define CONSOLE_VMWARE
-EOF
-	fi
-
-	restore_config config/local/general.h
-
-	tc-ld-disable-gold
-}
-
-src_compile() {
-	ipxemake() {
-		# Q='' makes the build verbose since that's what everyone loves now
-		emake Q='' \
-			CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" \
-			AR="$(tc-getAR)" \
-			OBJCOPY="$(tc-getOBJCOPY)" \
-			RANLIB="$(tc-getRANLIB)" \
-			OBJDUMP="$(tc-getOBJDUMP)" \
-			HOST_CC="$(tc-getBUILD_CC)" \
-			"$@"
-	}
-
-	export NO_WERROR=1
-	if use qemu; then
-		ipxemake bin/808610de.rom # pxe-e1000.rom (old)
-		ipxemake bin/8086100e.rom # pxe-e1000.rom
-		ipxemake bin/80861209.rom # pxe-eepro100.rom
-		ipxemake bin/10500940.rom # pxe-ne2k_pci.rom
-		ipxemake bin/10222000.rom # pxe-pcnet.rom
-		ipxemake bin/10ec8139.rom # pxe-rtl8139.rom
-		ipxemake bin/1af41000.rom # pxe-virtio.rom
-		fi
-
-	if use vmware; then
-		ipxemake bin/8086100f.mrom # e1000
-		ipxemake bin/808610d3.mrom # e1000e
-		ipxemake bin/10222000.mrom # vlance
-		ipxemake bin/15ad07b0.rom # vmxnet3
-	fi
-
-	use efi && ipxemake PLATFORM=efi BIN=bin-efi bin-efi/ipxe.efi
-	use iso && ipxemake bin/ipxe.iso
-	use undi && ipxemake bin/undionly.kpxe
-	use usb && ipxemake bin/ipxe.usb
-	use lkrn && ipxemake bin/ipxe.lkrn
-}
-
-src_install() {
-	insinto /usr/share/ipxe/
-
-	if use qemu || use vmware; then
-		doins bin/*.rom
-	fi
-	use vmware && doins bin/*.mrom
-	use efi && doins bin-efi/*.efi
-	use iso && doins bin/*.iso
-	use undi && doins bin/*.kpxe
-	use usb && doins bin/*.usb
-	use lkrn && doins bin/*.lkrn
-
-	save_config config/local/general.h
-}
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index 8e0a5495f087..3850249adbd2 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20160620.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
@@ -1,40 +1,45 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit toolchain-funcs eutils savedconfig
 
-GIT_REV="694c18addc0dfdf51369f6d598dd0c8ca4bf2861"
+GIT_REV="a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3"
 GIT_SHORT=${GIT_REV:0:7}
 
 DESCRIPTION="Open source network boot (PXE) firmware"
 HOMEPAGE="http://ipxe.org/"
-SRC_URI="https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2"
+SRC_URI="
+	!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-# TODO: Add arm/arm64 once figure out how to build w/out including
-# all the x86-specific drivers (that use I/O insns).
-KEYWORDS="-* amd64 x86"
-IUSE="efi ipv6 iso lkrn +qemu undi usb vmware"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
 
-DEPEND="app-arch/xz-utils
+REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
+
+SOURCE_DEPEND="app-arch/xz-utils
 	dev-lang/perl
 	sys-libs/zlib
 	iso? (
 		sys-boot/syslinux
 		virtual/cdrtools
 	)"
+DEPEND="
+	!binary? (
+		amd64? ( ${SOURCE_DEPEND} )
+		x86? ( ${SOURCE_DEPEND} )
+	)"
 RDEPEND=""
 
 S="${WORKDIR}/ipxe-${GIT_SHORT}/src"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-pie.patch #585752
-}
-
 src_configure() {
+	use binary && return
+
 	cat <<-EOF > "${S}"/config/local/general.h
 #undef BANNER_TIMEOUT
 #define BANNER_TIMEOUT 0
@@ -70,6 +75,8 @@ ipxemake() {
 }
 
 src_compile() {
+	use binary && return
+
 	export NO_WERROR=1
 	if use qemu; then
 		ipxemake bin/808610de.rom # pxe-e1000.rom (old)