gentoo resync : 15.02.2018

2 files changed, 21 insertions, 27 deletions

diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 9a96f36db941..e1464b9d5065 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -8,11 +8,10 @@ AUX seavgabios/config.vga-qxl 128 BLAKE2B f627711caa7dfbb236b4e9e83104d3d5c7d07a
 AUX seavgabios/config.vga-stdvga 59 BLAKE2B 7c10706c7d261f64e181d85c268375aa3b6b362bf3e5f1f391c52a6a3644a498a44c9627f60b6c47893c4fad24cc4667e816ab98e6bdcdb97b7d8f7463a8bf10 SHA512 4a1b7fcc729d78dc8fd4e73d1cb6258ed9d49f8a91e6e00cc184e07c89a304f8d38ef5446d1c4ba5e8e929c82693d82c21526e42992ad6e1a008f39bb7c90448
 AUX seavgabios/config.vga-virtio 128 BLAKE2B 98237322784b56cdff2c7d7298a419b18ab77031dfad9da743af73c3073a5b766be3940694a320c82ffda65c8a48e028eccd974d37ccd44f9ba0720b5787b53e SHA512 4d627be11d79f0b8bd814a49e608826375aba6b59a0189dcba9afe24a181347b92e6ab18e0d9199e2f7a78f8fb02f03dad84c63fbbc2ffe9af76777ef28c5f8a
 AUX seavgabios/config.vga-vmware 128 BLAKE2B 8ab374ee7b0ad5cd8f732ccc4983f2251a8ba4843bab358cb3e84e12a572e4e348094e762ecfaa94f704ad05d718bfebd34048b1db3076dae2309d7963794437 SHA512 2a82f75ca6dbf48546ffa5a756136dd7085855d9411c3b37a74cc53281027b4916cf628dba784bcad915682d94705b5f8116f7a1b7ec6a99d9b2fb3fffba01c0
-DIST bios.bin-1.10.1.xz 63668 BLAKE2B 82b055acc851305a2f9d54419da846a3ed1924038cdf1c97665c3953ddb9a404a373478a8f655a1ccc5b978a638c48604b2d77a2aa8989c177ece402be971d27 SHA512 9e3ba9c7dac3f03f9c57898a993eab34f8f3fecb0ac4718f6d4d6b1a825651a255e48fb7dc29a339249f42668469946f238674cb1f8308cf9b4a3e1e82c346d3
-DIST seabios-1.10.1.tar.gz 588092 BLAKE2B d27d16e5d02e00695dd8790ef63bc5d99815580d6d6d5bcbbb70b36a9cc7984cca6d1c4c274a20a992e11460b52583ec9e77f8e2b22066349f2915cbf6fb9e2f SHA512 b2f1c2b15853b1cc949f741ae13f32fd133efb0d0917e1cdfb253f9cd0bc9bb0b42c592cdd87bc74ccbb12a4301c102ae723ccdb490ea4716e0c9dca3dd3fead
 DIST seabios-1.10.2-bin.tar.xz 121172 BLAKE2B 9d4ff624b638773e59bbf6674fb8630bd815d75af1a81db4de7f9740c37485330e6d054448f2301a97455ff0d3190d988ce0348eac78bd978982b6ce5146e4f6 SHA512 a46ce389b8b0fe7182a3dc2954fab7e0ef27ac65823e3785c247ccf77c37eaa746d94f74a4a29a221aa16ab508cf07ec8d399aa612d5c0184b48bce24c663b69
 DIST seabios-1.10.2.tar.gz 589283 BLAKE2B 08fdbecf7fb06629db472adb05a780249dbf0e0a44d04dcced5480d631c133f74ecd04b04486db3bb817b8e119e783c4b09c3ade15b9a6cc956537e9f7204514 SHA512 ea8396fe247a3bd16b43ab775cf8e23f139673b94e83f450cadb094cc8117ca7e9ef518162d965209d5ab091c96f70ec5cc8ec8d15b638e06c4c8f7a0e1609dc
-DIST seavgabios-bin-1.10.1.tar.xz 20408 BLAKE2B e8678a5e1b7cf5c36017c3f3dec1996103304394215ce52e9fc23bb0581d253a87be0592eb5b2f1ef7bbfb03e80cd937d82b04a46c76e41fa5b95063782075b2 SHA512 7fe97efaf61c2d1e72c8df27b5108c80f6a51f5a7370de68720b0f71abe05ae5765dd867d127df2fa6182b5d4702a9ef7549e7170fec5071b31a6066db20c219
-EBUILD seabios-1.10.1.ebuild 3444 BLAKE2B 899b2f0c7804c76a4ec30796dbc242fc6d89f7686291073a351eaf5ad4f5e6685d3ec81a184ca4436aff36737ebff370d487799a4001f05f71d1a5fe02749b77 SHA512 6344ad74bebcb1752221d26fd22905a37ed3e4e70836f2916677088dc3add02546a423f4e97b49d9a837de9882d888dfb3dd5b49f249c2e0e0f9bff62fda7b69
+DIST seabios-1.11.0-bin.tar.xz 158552 BLAKE2B 44c42b9eea70a090ad51296949fe79e5360b569bae791fe84f447061f8dbcdb6b601501e2cc1607b62308f3118087386d15ba32c8495202f62f9f9a1e3cf27c3 SHA512 03a1523dc99dbf6e353e7844a4f12020d88bf8d5cbfd187007663ab1b02447b02694f27ee93aa46a18a5ab161f13b1ffe62f2d0f678cd86975a3d53295a6eb1e
+DIST seabios-1.11.0.tar.gz 607746 BLAKE2B 9f688be6b8f7c0fcbd72b59ac649a9c763fdd9e2971a4d85636c9972efc0ad42082a1622a8c41156ad1e2063907349c2e02cff9aeb444844dc445b5f7d6062bb SHA512 cae79c720bfbba3321777bbc6d5bde432fe56e2ba8f1be8acfebbde0bd453a58e889f5fa24db6055dca0a3a56d35b907761723ea35ef248c5f812129d0a27b77
 EBUILD seabios-1.10.2.ebuild 3411 BLAKE2B 60be808fdaa681aad580615c077896eb32cc0138207f56bf474fa93dfef80bdcda875e7757f242d5f01a3796857a036b8f81c2f71ee97fc3b7081101e4a6fcb6 SHA512 c1dd401ea38f1c4479d7c0c7436e13ac83288f0fa21b3ea368389b5b9dbda14d63ce319d92c6ea7a03c6efef9dd0d126691efa4d79f36c9d730f52cba85befb7
+EBUILD seabios-1.11.0.ebuild 3329 BLAKE2B 6ba1dff2ecb43431c85cc7f6a7678e003488ac415174b0de0e1e1a4df8fd4d7aed1b5c8e9800e2f70181f56b6e4665d94ddbaab791c2860f4d8a8b57a4c08813 SHA512 6b9d7c30535eaee2dec02151e132aef07016f272b175b651241b081e1847e049d1428d4c58414ea7da43a916047954dc85ad0ca7193972877facf52589ae064b
 MISC metadata.xml 663 BLAKE2B 54437b23d3d5ac74acee9b057e094c67db93d6b593367401d56e1b60a126a67ad9481ce15ffef0c004e2b554e90806e69bb7838594557fd36e461fb7c6a7cd09 SHA512 a3b306f0cfc8d0c2f31757b3b141c532dc5ee1fea7c01b7d23e6643977e63aee90a007875f1e34fb3f212c2dc1e23e4400f092b1d288f325abead33a9cfa66fa
diff --git a/sys-firmware/seabios/seabios-1.10.1.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
index c430395a16f8..699fca3bfa7a 100644
--- a/sys-firmware/seabios/seabios-1.10.1.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit eutils toolchain-funcs python-any-r1
 
@@ -14,20 +14,17 @@ inherit eutils toolchain-funcs python-any-r1
 
 if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
-	inherit git-2
+	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-	# Upstream hasn't released a new binary.  We snipe ours from Fedora for now.
-	# https://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
-	# http://fedora.mirror.lstn.net/
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+	# Binary versions taken from fedora:
 	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   seabios-bin-1.10.1-1.fc26.noarch.rpm
-	#   seavgabios-bin-1.10.1-1.fc26.noarch.rpm
-	SRC_URI="!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
-		binary? (
-			mirror://gentoo/bios.bin-${PV}.xz
-			seavgabios? ( mirror://gentoo/seavgabios-bin-${PV}.tar.xz )
-		)"
+	#   seabios-bin-1.10.2-1.fc27.noarch.rpm
+	#   seavgabios-bin-1.10.2-1.fc27.noarch.rpm
+	SRC_URI="
+		!binary? ( https://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )"
 fi
 
 DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
@@ -75,12 +72,6 @@ src_unpack() {
 	mkdir -p "${S}"
 }
 
-src_prepare() {
-	use binary && return
-
-	epatch_user
-}
-
 src_configure() {
 	use binary && return
 
@@ -109,8 +100,10 @@ _emake() {
 src_compile() {
 	use binary && return
 
+	cp "${FILESDIR}/seabios/config.seabios-256k" .config || die
+	_emake oldnoconfig
 	_emake out/bios.bin
-	mv out/bios.bin ../bios.bin
+	mv out/bios.bin ../bios-256k.bin || die
 
 	if use seavgabios ; then
 		local config t targets=(
@@ -132,8 +125,10 @@ src_compile() {
 }
 
 src_install() {
+
 	insinto /usr/share/seabios
-	newins ../bios.bin* bios.bin
+	use binary && doins ../bios.bin
+	doins ../bios-256k.bin
 
 	if use seavgabios ; then
 		insinto /usr/share/seavgabios