Add USE=binary support with upstream tarball #459346 by reno reckling.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 98 insertions, 17 deletions

diff --git a/sys-firmware/vgabios/ChangeLog b/sys-firmware/vgabios/ChangeLog
index 19d796b07d9a..01515a48f65e 100644
--- a/sys-firmware/vgabios/ChangeLog
+++ b/sys-firmware/vgabios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-firmware/vgabios
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/vgabios/ChangeLog,v 1.5 2014/04/30 21:06:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/vgabios/ChangeLog,v 1.6 2014/05/18 17:44:35 vapier Exp $
+
+*vgabios-0.7a-r1 (18 May 2014)
+
+  18 May 2014; Mike Frysinger <vapier@gentoo.org> +vgabios-0.7a-r1.ebuild,
+  metadata.xml:
+  Add USE=binary support with upstream tarball #459346 by reno reckling.
 
   30 Apr 2014; Mike Frysinger <vapier@gentoo.org> vgabios-0.7a.ebuild:
   Add epatch_user support #487100 by Hristo Venev.
diff --git a/sys-firmware/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index e7ae63cb9472..0dbe7e597539 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -7,23 +7,24 @@ DIST vgabios-0.6c.tgz 1470496 SHA256 eff20b9cb333fc5efb1fc07430b108084977d95fee3
 DIST vgabios-0.7a-fixes-1.tar.bz2 2602 SHA256 912bbe475a723760047c181ebec9cd5b1e99b3e528c43bbccb82b7c738656ae3 SHA512 30992efac011d4b99301960df08cdc69d9503aa6b61feed01fca2c5a910460269d9500650cb394a0737318e977a282c5e0ab613a8b2bc28b9f0c6528a9a77d73 WHIRLPOOL 304d135de9d7ddb5e9141cf90ef2e94d632a52c43e0ef156a477af1db5b2fa4dde79957b6c2cee3070e760c36670be20df34e2a9da4e5edb1fb4f1d42f6ad21e
 DIST vgabios-0.7a.tgz 1506655 SHA256 9d24c33d4bfb7831e2069cf3644936a53ef3de21d467872b54ce2ea30881b865 SHA512 35d789b1b39f8f05b757b6c3379a1b2c33dc27b244720471530325f3e215b5f4fa97cfbfc131f813013f4640fe85be912e7b4cb924fa87ed35e68b6966424874 WHIRLPOOL c03ffdcdb85cc3f20cad7d8962763e2cadf3b46c0dca559b0a9a509283101be4a8939bbde2f4b9a03c88dc2e52ce896d520d2e726a1db63adbc00d4b697e77ff
 EBUILD vgabios-0.6c-r1.ebuild 1902 SHA256 f8ef9a65218efa8e98f796717a7495ec9c51791a8824df4cd552552a18216fbf SHA512 5149285a49ba56dc8aa9efe748e3500cf973fa7adabe8a7fd67a1bd2246874c96d72d42603e1d0f816b74754bd89078db879659139c04fac8905c4233be6d82a WHIRLPOOL e08231bc4acaadba681cd2b47f569f2c5ceedf3d4cc9faa5e4523ad84fb7e9685feaa1d91c7238325ac16b763ab6756f3c72c49f2f0e624e5794cc0ea303c209
+EBUILD vgabios-0.7a-r1.ebuild 1855 SHA256 103efee7b031686f617885038534855547b32dd9863f63d49b57385fb5483d79 SHA512 46f2b32ab1b0005a9233c8e56ee4864dd4cd595fb9a2f7a74e65fcda6a3e29dee8955c6efeb39abbba2908921d0f16ec6d84f8d0a824be4aa4a1626700fe0bee WHIRLPOOL afb65d26eba2d1b76c4fb9bbfe5b6272c612c8502e6f40df748bca3484edc61e6a36f59c943d5be5876dce1a551bfd6e72f8e07d9a06616d03655e3ff433b333
 EBUILD vgabios-0.7a.ebuild 1829 SHA256 28d5fe24ed931daa1422c9f70224bb22b35927cd0a4dc9f1be0c06e8a32cb493 SHA512 0ad01b0fbd3f92e00123f342afea14993fdca64da5d83d261e80e52a30c18b97becd13d4e6cd0087d7303e86a4a173c743f05dacab8100f17ed6d9a08169d1b7 WHIRLPOOL 0dfc6114d63dd84dab9f0e6dd5427bfb903db842210724c36dbac0e7ee62064e16adf3e740e626ae152b36d3d93a1b5e5cc0d5b30090d9e4a8ef86f4b4abe7ba
-MISC ChangeLog 2868 SHA256 f767994824734bff125b6bffaaff2d0cdc381d5edad9a46f1f855c5291456cdc SHA512 04aa85ca118356797b1c4d25d35e625f2ab01d33df83bbbf1e384606236dd05c2e521f15933522dc17ece5157990ad8cb4c15b9a103368335811ae5cbae1ea3d WHIRLPOOL df07407fcbbc27bc534d8f758dbf07d7fc565be7412054f862f9ebc039370464fea126c1f581da8944e9fab9ddc26029cddcfeef8c1212201d047a7399b1172a
-MISC metadata.xml 253 SHA256 c9ca6980b185e0d86b42303a98572fd62ea4e18a796679b1583a4990bb40da7d SHA512 e313f627ded525c99fc31aeed49d1a59b532a7c108239f2f680c053cfe536c67a29d630171b900adbfbd04fb6230148b3a82d5f62a6b9c937caf6cb1ed9beefa WHIRLPOOL 7c1e1f886ef70ed91d2879fe9d1a67ada183f96b3ae6c3869acdcbce0f8677566f16e18a2cdfe7472432fd5e5649b6b68046db1b9633736e4b182c91196b472f
+MISC ChangeLog 3065 SHA256 2ce882f8ad9d66367e56e1e2981ecc1b8fba7673fcc64734d330bfbf00c52b4b SHA512 f373f83716606fe042204b4a6f684e46fa77c2fb1a5acf141af0410d09b3bc53b15d4ffc2bef1124cbe7f08aa983cf98bc56aaac6914534b0a657bee5b1ca95a WHIRLPOOL 4938454178cade639910ba4dc3f119424c3836e87caca1c7e70954034ed1845d52c53762c7aa214ac9339db4c102034ac05ddd0504a290724a3de8257ae10ab1
+MISC metadata.xml 370 SHA256 d1de3a120b20c8a5373b02a58919e2b7482e04c8911f6051107e9c177c912cec SHA512 f7ca51b86820617a2a36279eebc91ce1689ee3724379aad5bfaeda0d18ba78bb1517969359ae6bcbd2650ac24230940fce043a9b5c9f8957793ae02f368be10f WHIRLPOOL faffba76fbd049fd62061bba647979c574510c8f11d4c4420d3667e14d16c91bb1aa1b4c52e3380254cc91b9d372c4e2974d65dff154f40655252474ced02a57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTYWXsAAoJEPGu1DbS6WIAC7gP/3DPnhHTbBGgPpoJkfxk5aWe
-ZKhium9ibn9DM2R47z2Ad7RbgrEdHAtTyb7nc53XmOKTrr2kW/bpVGjd25xfWJIT
-TpU27zm/4MxfJXUV4EKU+97UPdiTioqtpE5ANHIKzLFP+K5FLNq5lZiyIJLtgGi7
-YbIhGIQdo297hrq2tbPAzMt7Z54dI0+6YHKmQnK7tG9Hdep54GNL+8i/GZca/fyh
-hlvD3svVZ3vxD4XgmUYc5TCy6U7Bgm6FkLZdPYJtd3dsxTTIPrJhMtXomPpQrQaP
-i1LDbY/60q3MrEuqvssqJ8ypaQgjkkQxxvvNtIlKwXmO7ZvawnVc75uv+zDB2E6s
-qv9pzluXRGR7zlG6pcPOyWcH6aE08/QxyUTh7+h/yNXEZdL7GWMx0Y5Lq5MiZtqM
-/lxJEMmE6cOZygV3iKTulPurBPT2vydenz34ma2CEcaGc3pflC08HoeojAYLxSJ+
-n3Fa7eLjNcrYIPJC/MtD06ildES8qml0QzcxjyblPZf3GSGQWpxvfh+5kMOJkWuv
-+wJrF3XethEAmL/elt6m/RKKuMbxNFtkNJQpUNeEtvkgHo2ZCirsOMpTIuMs60WV
-jPAM4v8qdXTzIv6vSwU6I6IPCreW8pt3OZPW1kJys9Uj68/bwc4yfeF3muZyBuzA
-de8HMnEHWb4FpG73kbqk
-=hloY
+iQIcBAEBCAAGBQJTePGIAAoJEPGu1DbS6WIAdc4P/iW7xQy3fS2VBf7PB3zCrAuk
+L2eWkER3zTlerC0V9t7bLtV/usCD9Etjfg9NxoXyzDvhXaLNdabZX0ATiFxP8oWJ
+MV9HjI0fnJz3tcvKMLmGKCQydqDyTe4DbY+LiHsZ2D+VWt7DgX2fjChEQRu1Uivw
+0egtf/DrUJZdpa8BQLVcugwVltdoM/10NhmDLj0RSlIKa1mBUp8I5Qx1UZ2S7sd2
+VS+CPVi0H08iPPKzADBGxDVaKlHebnwW9AujOYc5Owt6cjeohGQKcKKhKt5+Tga6
+MRk2pgpSpkh99/qSj8oQqobmafxgEigfGaD46ckHqSyETR9cGf4dnKkdwmmPR7i3
+fBmNLnHzfjj5rIpaGmTgCf+6yzCCSMH8CZqSN1uzgXk5Dr9wHNDcXq8B2Degq4U6
+HcOn2gOFfTPzJlVcEpeK9Z6/q41xdImRTlFVh1tD26uPjR7DBGnLKPnuSZIDA7mv
+UHt+W2AISEyIky6EA9bU0wRvITjK88xrT8//II46Gk6rbA4NNnP1UagQpph5Flim
+vFetSzaWFJGaciwjJLTSjlIQ28iBkuo9VQ18S2YRh5/sTtTydDND4BUztxp9CewQ
+gFiyNYzwYOwQ8FQmLorpIynEhfCVEFOU36BN5Yc1uReDh5wKdMJTsEGXiKQX2grH
+9Xp5LK+1MvKdRH6kDQ0/
+=AU7N
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/vgabios/metadata.xml b/sys-firmware/vgabios/metadata.xml
index c2e341220446..5ff1b92d840d 100644
--- a/sys-firmware/vgabios/metadata.xml
+++ b/sys-firmware/vgabios/metadata.xml
@@ -6,5 +6,7 @@
 		<name>Doug Goldstein</name>
 	</maintainer>
 	<herd>qemu</herd>
+	<use>
+		<flag name='binary'>Use official upstream pre-built binaries (only default and cirrus images)</flag>
+	</use>
 </pkgmetadata>
-
diff --git a/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
new file mode 100644
index 000000000000..c191b31caef4
--- /dev/null
+++ b/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/vgabios/vgabios-0.7a-r1.ebuild,v 1.1 2014/05/18 17:44:35 vapier Exp $
+
+EAPI=4
+
+# Can't really call them backports when they're fixes that upstream
+# won't carry
+FIXES=1
+
+inherit eutils
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tgz
+	http://dev.gentoo.org/~cardoe/distfiles/${P}-fixes-${FIXES}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="binary debug"
+
+DEPEND="!binary? ( sys-devel/dev86 )"
+RDEPEND=""
+
+src_prepare() {
+	[[ -n ${FIXES} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_compile() {
+	if ! use binary ; then
+		emake clean # Necessary to clean up the pre-built pieces
+		emake biossums
+		emake
+	fi
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	# Stock VGABIOS
+	newins VGABIOS-lgpl-latest.bin vgabios.bin
+	use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+	# Cirrus
+	newins VGABIOS-lgpl-latest.cirrus.bin vgabios-cirrus.bin
+	use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+		vgabios-cirrus.debug.bin
+
+	if ! use binary ; then
+		# QXL
+		newins VGABIOS-lgpl-latest.qxl.bin vgabios-qxl.bin
+		use debug && newins VGABIOS-lgpl-latest.qxl.debug.bin \
+			vgabios-qxl.debug.bin
+
+		# Standard VGA
+		newins VGABIOS-lgpl-latest.stdvga.bin vgabios-stdvga.bin
+		use debug && newins VGABIOS-lgpl-latest.stdvga.debug.bin \
+			vgabios-stdvga.debug.bin
+
+		# VMWare
+		newins VGABIOS-lgpl-latest.vmware.bin vgabios-vmware.bin
+		use debug && newins VGABIOS-lgpl-latest.vmware.debug.bin \
+			vgabios-vmware.debug.bin
+	else
+		ewarn "USE=binary only includes default & cirrus bios builds"
+	fi
+}