Version bump. Sync with the live ebuild.

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 39 insertions, 23 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index 2f83afd681c7..71b45f34bc57 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/flashrom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.20 2012/02/18 18:58:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.21 2012/03/02 01:47:54 idl0r Exp $
+
+*flashrom-0.9.5.1 (02 Mar 2012)
+
+  02 Mar 2012; Christian Ruppert <idl0r@gentoo.org> -flashrom-0.9.5.ebuild,
+  +flashrom-0.9.5.1.ebuild, flashrom-9999.ebuild:
+  Version bump. Sync with the live ebuild.
 
 *flashrom-0.9.5 (18 Feb 2012)
 
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 21de8574d8bd..ace99107e4a3 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -2,20 +2,20 @@
 Hash: SHA256
 
 DIST flashrom-0.9.4.tar.bz2 293396 RMD160 b8742aae4d631a04c0fe8c8227b95fc9e7092a1d SHA1 93d727f3144e0a43cc2e792e40a37c97781a6257 SHA256 30e5a61a09160f142fdeec4a6c83cca495d7f2a9fc2eef480646889c3e9f0b3a
-DIST flashrom-0.9.5.tar.bz2 345075 RMD160 995f1c6b9fff58e950d9aec3557b69ae91357eb0 SHA1 3340fd68f3c2aadbb2b57cdaf80128067d98b922 SHA256 fe13609fb4ce0fd7693ed43fd00f13dd53fdb824035cbd8d0f2170ac1abd271a
+DIST flashrom-0.9.5.1.tar.bz2 346371 RMD160 c23f32a4b85de117296fc682751619c0e57c61db SHA1 5d454e586766418ecd53e7433673de645df74742 SHA256 6c692382c4effc30073b02df3c4d7ec96c4e29eb9bdcc921c143d5ab8c5ee5c6
 EBUILD flashrom-0.9.4.ebuild 2617 RMD160 4cf8369a76454df2b4c70f16dd2e8e147e7c2bc8 SHA1 a9545feb0a1c291561d11cfbf3de6a8f2675467b SHA256 67f753cbab7adcd13ce5acb4e5660a5a1229cd99e85fbfb9008cd435be7c8bd8
-EBUILD flashrom-0.9.5.ebuild 2712 RMD160 6007c39bdebc9cc37324b4cd24323ab2f1ee3f34 SHA1 7181589e0d55812a18571317c94f8d3e67663c04 SHA256 49376463bfd3efa15f73ea706d42b42e3b44bdb62373cd5d82d0ba518cb6eb8b
-EBUILD flashrom-9999.ebuild 2733 RMD160 930d58ad6583c26ff68d589a7653ffa060693eba SHA1 24a648f9929518d904e2413d5f6604e0bc0ad5c2 SHA256 de43ef7bf48e28c390c01700de432a82b61a781356e78384f36cfe74fa68eab5
-MISC ChangeLog 3223 RMD160 52b2261b70fb1d3504e0e015075e1f0e559e644c SHA1 5af0d1272ce8791afcbb5de8f1362087cba09175 SHA256 35499b87ad71ae132c7bae213ec8eaced92a9e9829985572efe0f4affbecd907
+EBUILD flashrom-0.9.5.1.ebuild 2790 RMD160 e6a59a5ccf080f9ecfa85e404d478b7837c8e607 SHA1 8c9326707903beb86b19e8ca94be7f7d18fc7df3 SHA256 345ab2a64a0c743e2d4a138d44eb089bd07c8299311ee1daee7e50a9659f31ae
+EBUILD flashrom-9999.ebuild 2787 RMD160 cc2c5d2b571240e961a762ea587391b7df43ca18 SHA1 ede7f9ba767fd21770e26bb35005a4dcc966e8df SHA256 c9677fbe1e6bacfd74b7bfd8dfbae5042f4aed81831c25433a92c9b5a29af602
+MISC ChangeLog 3426 RMD160 1bfc3efb0ed3d9ee92c059902bbaeddb0e5a1064 SHA1 92ea5f13027eb6bb508be3af4112ab74eacae0be SHA256 7df14151f896d9a0749db60d6dbd26c135f8a024f5939dcfa4c9cdca4255a2fb
 MISC metadata.xml 3292 RMD160 5693f6251cbe00ff84a77d27083fb89cd9f19dad SHA1 ac3e6f3563d91795cc9bdb01816a49d8912551ca SHA256 a3ad4b81cab89f557340a83761172cb41c980d1dac5a2dffd8d2bc3e073d83f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPP/S/AAoJEMOx0zmdw4Z1Y4YH/Rp1mhTuPyMS7pneX3yhJhq3
-QABLaXHKgVCjlD+7jozgOn1uEIkPtQbOupKJGYWr77dU7GpYEuMCi2J851fDEMIs
-KSxa6jA7i3TnuLjNemF24o4eenOqShYkQaDIeWQu8IqcWZwd/Lo7rw7HU9Uoy2oQ
-T4K4yXRMNAYBY8szm6xQhoZ6X9ijqVxryEqIBGoz2Jw9bSCMM6jmrau5sSeYaCZv
-dbE93CMA39wt0zG+mAq6o+IvkR0weImN72LPnaeSQdYtslwrfDfAHtQPf160UDMa
-6jNuAuq8SozP02gZdDAUpN5RugJ97Q2TFiELXWhcDeomZVpW5LvNR/gGyoEF4Jk=
-=cTeh
+iQEcBAEBCAAGBQJPUCbTAAoJEMOx0zmdw4Z1g4gIAKmB7VBapKa4qpn4yO6C3bHk
+dPY2DKROCZHCh40hGzdqvEyVPtsxvHXweUtaS7XI8ERrYJ7EwtP9Y8WfQfF6Lai4
+D1KOs5i2DCpiE68cNVt3DDeHzpt2WpqzOt6io0IIJYcKTbpTR0Yy+ZjtQKQLxI81
+9CQIdwgf/bxeLs96GKs94wgeK5rBPh0704WP9b7MiN3qDDH2EfC6iQjwi4GZKhvR
+QVd09xe+kZ9+2ZOtSihuKbFwd+M4Pz1wfCx3ILj/GK7Uf6yDwM+3mi4Il+GIkEnh
+3TneJp76jW8SfABzxYqD1+p5pWNl8NpjTNwteQ8OC4/o2gfSvRsS07M/pnJUapI=
+=jGqe
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/flashrom/flashrom-0.9.5.ebuild b/sys-apps/flashrom/flashrom-0.9.5.1.ebuild
index 673faea22496..34cc3b2c50be 100644
--- a/sys-apps/flashrom/flashrom-0.9.5.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.5.1.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.5.ebuild,v 1.1 2012/02/18 18:58:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.5.1.ebuild,v 1.1 2012/03/02 01:47:54 idl0r Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://coreboot.org/flashrom/trunk"
+	inherit subversion
+else
+	SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
 HOMEPAGE="http://flashrom.org/"
-SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog doc +drkaiser
 +dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel +nicintel_spi
 +nicnatsemi +nicrealtek +ogp_spi +rayer_spi
@@ -40,7 +45,7 @@ DEPEND="${COMMON_DEPEND}
 
 _flashrom_enable() {
 	local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}"
-	args+=" $c=`use $1 && echo yes || echo no`"
+	args+=" $c=$(usex $1 yes no)"
 }
 flashrom_enable() {
 	local u
@@ -79,7 +84,8 @@ src_compile() {
 	fi
 
 	# WARNERROR=no, bug 347879
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" WARNERROR=no ${args} || die
+	tc-export AR CC RANLIB
+	emake WARNERROR=no ${args} || die
 }
 
 src_install() {
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index f599dd34a916..10496be628ad 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.1 2011/10/14 18:54:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.2 2012/03/02 01:47:54 idl0r Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
@@ -18,7 +18,7 @@ HOMEPAGE="http://flashrom.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog +drkaiser
+IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog doc +drkaiser
 +dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel +nicintel_spi
 +nicnatsemi +nicrealtek +ogp_spi +rayer_spi
 +satasii +satamv +serprog +wiki"
@@ -92,4 +92,8 @@ src_install() {
 	dosbin flashrom || die
 	doman flashrom.8
 	dodoc ChangeLog README
+
+	if use doc; then
+		dodoc Documentation/*.txt
+	fi
 }