From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 15 Feb 2015 07:07:44 +0000 (+0000)
Subject: Avoid downloading files that are not used (e.g. no source tarball for USE=binary).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f6da8910233be3dd78f48624735e3ce5032304e2;p=gentoo.git

Avoid downloading files that are not used (e.g. no source tarball for USE=binary).

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

diff --git a/sys-firmware/seabios/ChangeLog b/sys-firmware/seabios/ChangeLog
index 920efeee4ff4..9861400e0567 100644
--- a/sys-firmware/seabios/ChangeLog
+++ b/sys-firmware/seabios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-firmware/seabios
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/ChangeLog,v 1.36 2014/11/08 18:25:36 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/ChangeLog,v 1.37 2015/02/15 07:07:42 vapier Exp $
+
+  15 Feb 2015; Mike Frysinger <vapier@gentoo.org> seabios-1.7.5.ebuild:
+  Avoid downloading files that are not used (e.g. no source tarball for
+  USE=binary).
 
   08 Nov 2014; Agostino Sarubbo <ago@gentoo.org> -seabios-1.6.3.ebuild,
   -seabios-1.7.0.ebuild, -seabios-1.7.1.ebuild, -seabios-1.7.2.1.ebuild,
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 79c46e20a88b..0a8db2c6cee1 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -3,23 +3,23 @@ Hash: SHA256
 
 DIST bios.bin-1.7.5.gz 78943 SHA256 2e83e68e6cff73ede1c2490dabad74c177d7b67f9d93a5ed5f2ef39e76dea0ea SHA512 153a4cf190843540a9a72fcb0cf34f1f9f6ff2efb4b4f700c515dea467b101a8999421b53c2f21599864e2e803ae455a4ae39c7e8be9491c4383b4bfbe734014 WHIRLPOOL 2383f5f3a91581b0ee0ff19fd429a67b7fe09db05c456b98aee01ab9008a12d265e56f81b4d60224c7be15a86da9d2288f83a1d83f621b2ff00ab3aaccb277a4
 DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
-EBUILD seabios-1.7.5.ebuild 2715 SHA256 cb84624e675fd11b6af71b237f2b1dbe0477918e460c852df525dfc5640be34c SHA512 d73304b2a024c7849917f03c51d417a420dcf769bac0487f32d095114f5c9ef1a1888d39d036b82df49f6dc6b92affd61ec9d62222c0b2cdfeb3b8f506c1fcb6 WHIRLPOOL 6de957ba4dff0f459d445e5e81e417fe4b65e4a0d682b9a03f53115e76d3614f26cdeb3f49dfef3e20837567e4ca041bcd7ace196a2ed3cbc4f104dec87b879a
-MISC ChangeLog 7512 SHA256 0f0c6904040a0b209ecf31d297008df25a0ce2d45893e650212a1385e99326fc SHA512 3d489b6235972b18c1b0e86f627adab8e4b2e2d0d37aae5a4bdd92da7e77f27546b51590c7da77d0b1e0af6f4aefbb624f45f3bc6e84e2c918cf50445523f3bd WHIRLPOOL 0d8d2c03916c947c840dfe25f28c047228a67e61e1576273f96300aa1ee8d1e338cb8dfed1d5eeab34b22c5201d6c3dabdbe456853f84eb2708c5436bb3e0684
+EBUILD seabios-1.7.5.ebuild 2762 SHA256 a82fe143dc64bd798d9bf6f9c46a6c369b603766a86767524d3b7e2c89b858fe SHA512 b9db7c968f4255e4ee41efc5f1e79e9c81750f47bece65c3aa018b5e32f7bd9a1ee9a5faa5d1bb9228ecd6413b9e76b2f576d307362f280586354fc6cb9b4e47 WHIRLPOOL 0dd3c1a5884ef876ffd9749743ad3652235a9c8a33b8d76ea1c0d8f3aeb30975322c27657bb673c12b917a2ea392252f4b416d9d86d3d86de910d8d84a6aebf7
+MISC ChangeLog 7675 SHA256 52c60e4b6a6100f23bc9195c9e91e64723260b5601a6dc27f0941fd27ddde389 SHA512 cb368b995c0305f4ce339d11c47357804c4f89981c8e782c20c00ce5ecca0799f8a0639f48f5b4303f59687c4919e0dc5495ca442de604dbf80b458a195ab522 WHIRLPOOL 99834577fdbaf0ef833b5b03af12fc2a1d409459d7cc85166e2db66a46bec23ae0e8aa757d00dfc1a6f8884422cf90fce355f7cf9058b915d72fc207264581a7
 MISC metadata.xml 348 SHA256 d3c5d1a4872e9f9c7006e20ea9abdd6b4f661041eb00111b09f4d7054b9a875c SHA512 a8424c71b656df412b38b171638815f32476496cd08faccb5504f9371960442af6fa0ed531609e43ca527f7a2df1ff2821938a060c35d43cfa2612e7c6ed3998 WHIRLPOOL ee7ccf452f7de334cfb398a4e735f139a7e24363b82409838062662755b565ca7f43e9bdc5c31c839352d8a4d64dd419722b7e413b243ad470199a4aeca12544
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUXmAhAAoJELp701BxlEWfQ/gQAMB6qtZigSn3meFKvrKJ7aQO
-JrBa9QjVOa1tebwbXDuJKFT8uu+pNn3ew+1DnaIeoTKqyG8GWyz/MJkOYg7jL4oj
-QGgG8dk22A/dnXokMZ0iI+tYYizF6mVcF4yBClitGfmBuvGw7K1YH6a8ETf/lP7B
-Mdkx9tNyeV95Yzscg+7IQD9vMsitLmHsIG9yTlkFL7qXok9ok3WhndWzMbJtINdN
-ZhpHoTofXAS3qudwFUAodolDm3bqqi5U19TyCKcvk0KAshGkk5i1uykGDIUvqjPL
-lMVz/l/4xJRcnCg9kBACl+eUSDoF8g5aCY7cyLis9pPx7zGOQHZaqkbOVuYAbM2i
-DTY4Ps+CEYpbFbAOAnU1FrmSm/ZDCeoK1J/bdzwQI/KWgPg/jXGa2dHD/GMkBi3Y
-q0fkukHPsn6Yh1ozfvD5G57AZ62lI2u7mk4rGyb6Y6JOJYvln52pcwZW/nMrv/Xc
-m2VEFSRVowNa7ntXN8lST7QKHs1hgoMoOH1dxEL6WDt++xNdha7LaeTW0ijVzPvu
-Ho3IFcQ6XW+yW38syJwyoZ6TKkzSo/xCM41CFfnMN/1fV06pR7kgE9I0d8O0C/lZ
-6xhQ6vnj3FBOlBZjMGfIPJ/THg4SaDUQufi3r8LJ7lGd4ryKUzKG7kpaXiAbFKB4
-3QTkGngDdIgasOXkTGWI
-=04Kr
+iQIcBAEBCAAGBQJU4EXAAAoJEPGu1DbS6WIA2usQAIbx+AXLCaFQwprKR98ppLJ6
+Ya99F9ElhhjRCnftJnRALMovSn+IurtYLrBuLHUzGDA94CHctZ2CtmnIiHxspCkV
+Js4eyFoMeD908C765xt4zKSw5Mw6iCIpot0pgT94yUv1NKLGfch2y1dqytJpcQpf
+agPjUYZ5QMPDjzdbYUG0vwc4WuIwO9ord9wqe5BQP1+3EmlT+nRXxnbvenc3NBhk
+DZRJaNpnKPl6vxnNHkcwajpG0Z4gSfbYQD7ob04A5SKW+wJ3gAmKvIbvGRMyHld9
+0byxSjglXRnVqkfHH8hqiqHKhlO+5vdWaFUme1PwNQV9Dlmd2BEHeFi/vI5OD2oH
+tJIxDOt7IXMUjkzN4X2NHMzDonOy8gtyHSL9kAsyeEhC1O4g9mBbBLmalPHF+BK6
+LL/F5mdgBf2QX2qDKsnpfqxgRnRnQHTJWJPCzTnvVYPHRYA9EIIMp7dBmXdAj5Av
+24g7kMktyrAnN9iuCBV+sXoxAc2QOs08HXn/hoGab8Emtb0UeQHMXwcR+858PuOZ
+DWQeiqNGHr3cUb+auCFd20kXR3eYAPSiD3QerXwoF9NVK7bvqjC25+SNpnpguBPi
+C4oYNSAK1iFRgd8ciDpCdT3qdba9xRMd17fJ7itOOvbiGduXN8Z7jbBVlnBwnx64
+d2+2hjY5BdUYQlcxYbG4
+=klkv
 -----END PGP SIGNATURE-----
diff --git a/sys-firmware/seabios/seabios-1.7.5.ebuild b/sys-firmware/seabios/seabios-1.7.5.ebuild
index 1cc4c7efc3ac..1c92d33025cb 100644
--- a/sys-firmware/seabios/seabios-1.7.5.ebuild
+++ b/sys-firmware/seabios/seabios-1.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.5.ebuild,v 1.3 2014/09/13 17:07:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.5.ebuild,v 1.4 2015/02/15 07:07:42 vapier Exp $
 
 EAPI=5
 
@@ -20,11 +20,9 @@ if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
 	inherit git-2
 else
 	KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-	SRC_URI="http://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz
-	http://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
-	http://dev.gentoo.org/~cardoe/distfiles/${P}.tar.gz
-	http://dev.gentoo.org/~cardoe/distfiles/bios.bin-${PV}.gz
-	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	SRC_URI="!binary? ( http://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz )
+		binary? ( http://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz )
+		${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
 fi
 
 DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
@@ -66,13 +64,22 @@ pkg_setup() {
 	use binary || python-any-r1_pkg_setup
 }
 
+src_unpack() {
+	default
+
+	# This simplifies the logic between binary & source builds.
+	mkdir -p "${S}"
+}
+
 src_prepare() {
+	use binary && return
+
 	if [[ -z "${EGIT_COMMIT}" ]]; then
 		sed -e "s/VERSION=.*/VERSION=${PV}/" \
-			-i "${S}/Makefile"
+			-i Makefile || die
 	else
 		sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
-			-i "${S}/Makefile"
+			-i Makefile || die
 	fi
 
 	epatch_user