gentoo resync : 15.02.2018

3 files changed, 124 insertions, 1 deletions

diff --git a/sys-firmware/ipxe/Manifest b/sys-firmware/ipxe/Manifest
index 6ea6c2cf3f72..0c6b17ce46f8 100644
--- a/sys-firmware/ipxe/Manifest
+++ b/sys-firmware/ipxe/Manifest
@@ -3,6 +3,9 @@ AUX ipxe-1.0.0_p20130925-no-pie.patch 1059 BLAKE2B a7c28d556db0fae9acb8c3ba83dc0
 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
-MISC metadata.xml 787 BLAKE2B 676a756c14f6f84f5dc35f8e089ad705f05919a96006830997df328e62fe63acd8fa5be3b0bf3c046494ba0b12c93d297f40867724e7e1720b55f84fa94d1a0b SHA512 3fed11d48c302d4800b20f4b7fb6a232bfc388b950b88357f35a33792063f1c143eb7f97e16cfb35ddb893688fc1efeac47a40dd56f97c18ebbd3ad690393b34
+EBUILD ipxe-1.0.0_p20180211.ebuild 2806 BLAKE2B eadb782d89ff5bca27ff4df29a18b899b6f97bc6ddf39453b2552ce7599a938d8c7b4570a2155cbdb0ee613d0dbed950ca08ac052b8adb5aeaf1e40b3085bd73 SHA512 87b8ff0e0acaf9673e81302cdda9a570925de66e11ff2272cb7024b8c213a2f66f3e12b1c19427ebd481c5a231e092e9eba7ef53e4e5d010ef855b12ac718f86
+MISC metadata.xml 838 BLAKE2B bacad3c1d9cbe5877e16d1709873f571543afdb66241afe5e520b8d980eaaa7896407eecaf8226e9b73135dfcd2dc1078351126b1c00c07c7d8f2b72a8818ae0 SHA512 604ae9fc9d7d8e85fe093638b9d18f27e0a018a4da99d5d5b1bfe31748c3e9624717db056929e1b81db2f944b623043cc088ef7e2d2cb483159e9521d091ccd5
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
new file mode 100644
index 000000000000..1794162081a7
--- /dev/null
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils savedconfig
+
+GIT_REV="546dd51de8459d4d09958891f426fa2c73ff090d"
+GIT_SHORT=${GIT_REV:0:7}
+
+DESCRIPTION="Open source network boot (PXE) firmware"
+HOMEPAGE="http://ipxe.org/"
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
+
+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_configure() {
+	use binary && return
+
+	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
+}
+
+ipxemake() {
+	# Q='' makes the build verbose since that's what everyone loves now
+	emake Q='' \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		AS="$(tc-getAS)" \
+		AR="$(tc-getAR)" \
+		NM="$(tc-getNM)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		HOST_CC="$(tc-getBUILD_CC)" \
+		"$@"
+}
+
+src_compile() {
+	use binary && return
+
+	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/metadata.xml b/sys-firmware/ipxe/metadata.xml
index 79e3a615e175..2dad71b85b76 100644
--- a/sys-firmware/ipxe/metadata.xml
+++ b/sys-firmware/ipxe/metadata.xml
@@ -5,6 +5,7 @@
 	<email>qemu@gentoo.org</email>
 </maintainer>
 <use>
+	<flag name="binary">Use pre-built binaries</flag>
 	<flag name="efi">Build an EFI program for using PXE</flag>
 	<flag name="iso">Build a bootable ISO for using PXE</flag>
 	<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>