Version bump

Package-Manager: portage-2.1.10.44/cvs/Linux i686

3 files changed, 39 insertions, 20 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index 6d623d5a71a6..2f83afd681c7 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/flashrom
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.19 2011/10/14 18:54:46 vapier Exp $
+# 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 $
+
+*flashrom-0.9.5 (18 Feb 2012)
+
+  18 Feb 2012; Christian Ruppert <idl0r@gentoo.org> -flashrom-0.9.3.ebuild,
+  +flashrom-0.9.5.ebuild:
+  Version bump
 
 *flashrom-9999 (14 Oct 2011)
 
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index c63f210b07d3..21de8574d8bd 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST flashrom-0.9.3.tar.bz2 252146 RMD160 603a686ef32c884ef46e5334752776b56f64734b SHA1 d6208613780eb05d54bf103f0f5229405ebecd6b SHA256 e9efc85a1314e343c5e88a232c5f75e2b4233da0de99ab6c447f0ff6551488a0
 DIST flashrom-0.9.4.tar.bz2 293396 RMD160 b8742aae4d631a04c0fe8c8227b95fc9e7092a1d SHA1 93d727f3144e0a43cc2e792e40a37c97781a6257 SHA256 30e5a61a09160f142fdeec4a6c83cca495d7f2a9fc2eef480646889c3e9f0b3a
-EBUILD flashrom-0.9.3.ebuild 2456 RMD160 29758eb8397fef0bec6f6a7e8397f274723ece67 SHA1 428b6b8dcd69c2be714fd8c24701a06894a007c0 SHA256 a4e05aa015f77f9d923cf28f3a0aba5ba6850ed2d4433349bcfdca8cb48e58be
+DIST flashrom-0.9.5.tar.bz2 345075 RMD160 995f1c6b9fff58e950d9aec3557b69ae91357eb0 SHA1 3340fd68f3c2aadbb2b57cdaf80128067d98b922 SHA256 fe13609fb4ce0fd7693ed43fd00f13dd53fdb824035cbd8d0f2170ac1abd271a
 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 3075 RMD160 f56a65a85cb7c666112a59952fd0e07d3c62ae5c SHA1 af9b657d61ce8ba7e9b983dcaef82bd7d2085eab SHA256 9e4a740dbda546c083d2e0ba5bdee59ce57762af562c4a8c742a71aedb5caedd
+MISC ChangeLog 3223 RMD160 52b2261b70fb1d3504e0e015075e1f0e559e644c SHA1 5af0d1272ce8791afcbb5de8f1362087cba09175 SHA256 35499b87ad71ae132c7bae213ec8eaced92a9e9829985572efe0f4affbecd907
 MISC metadata.xml 3292 RMD160 5693f6251cbe00ff84a77d27083fb89cd9f19dad SHA1 ac3e6f3563d91795cc9bdb01816a49d8912551ca SHA256 a3ad4b81cab89f557340a83761172cb41c980d1dac5a2dffd8d2bc3e073d83f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6YhX0ACgkQaC/OocHi7JasUgD/aEoauP/hroQTIUWiEy5D9Peq
-0qRQG+HKblBKrqV5MzkA/j7xgWHtQCJ2fp4Wuujfuq6AechFhAtlUcnxYD57hb5M
-=SQdd
+iQEcBAEBCAAGBQJPP/S/AAoJEMOx0zmdw4Z1Y4YH/Rp1mhTuPyMS7pneX3yhJhq3
+QABLaXHKgVCjlD+7jozgOn1uEIkPtQbOupKJGYWr77dU7GpYEuMCi2J851fDEMIs
+KSxa6jA7i3TnuLjNemF24o4eenOqShYkQaDIeWQu8IqcWZwd/Lo7rw7HU9Uoy2oQ
+T4K4yXRMNAYBY8szm6xQhoZ6X9ijqVxryEqIBGoz2Jw9bSCMM6jmrau5sSeYaCZv
+dbE93CMA39wt0zG+mAq6o+IvkR0weImN72LPnaeSQdYtslwrfDfAHtQPf160UDMa
+6jNuAuq8SozP02gZdDAUpN5RugJ97Q2TFiELXWhcDeomZVpW5LvNR/gGyoEF4Jk=
+=cTeh
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/flashrom/flashrom-0.9.3.ebuild b/sys-apps/flashrom/flashrom-0.9.5.ebuild
index a3dd27babbaa..673faea22496 100644
--- a/sys-apps/flashrom/flashrom-0.9.3.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# 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-0.9.3.ebuild,v 1.6 2011/09/19 15:29:05 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.5.ebuild,v 1.1 2012/02/18 18:58:02 idl0r Exp $
 
 EAPI="3"
 
@@ -8,14 +8,15 @@ inherit toolchain-funcs
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
 HOMEPAGE="http://flashrom.org/"
-SRC_URI="http://qa.coreboot.org/releases/${P}.tar.bz2"
+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 +drkaiser
-+dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel_spi +nicnatsemi +nicrealtek +rayer_spi
-+satasii +serprog +wiki"
+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
++satasii +satamv +serprog +wiki"
 
 COMMON_DEPEND="atahpt? ( sys-apps/pciutils )
 	dediprog? ( virtual/libusb:0 )
@@ -24,11 +25,14 @@ COMMON_DEPEND="atahpt? ( sys-apps/pciutils )
 	gfxnvidia? ( sys-apps/pciutils )
 	internal? ( sys-apps/pciutils )
 	nic3com? ( sys-apps/pciutils )
+	nicintel? ( sys-apps/pciutils )
 	nicintel_spi? ( sys-apps/pciutils )
 	nicnatsemi? ( sys-apps/pciutils )
 	nicrealtek? ( sys-apps/pciutils )
 	rayer_spi? ( sys-apps/pciutils )
-	satasii? ( sys-apps/pciutils )"
+	satasii? ( sys-apps/pciutils )
+	satamv? ( sys-apps/pciutils )
+	ogp_spi? ( sys-apps/pciutils )"
 RDEPEND="${COMMON_DEPEND}
 	internal? ( sys-apps/dmidecode )"
 DEPEND="${COMMON_DEPEND}
@@ -50,8 +54,9 @@ src_compile() {
 	# Programmer
 	flashrom_enable \
 		atahpt bitbang_spi buspirate_spi dediprog drkaiser \
-		ft2232_spi gfxnvidia nic3com nicintel_spi nicnatsemi nicrealtek rayer_spi \
-		satasii serprog \
+		ft2232_spi gfxnvidia nic3com nicintel nicintel_spi nicnatsemi nicrealtek \
+		ogp_spi rayer_spi \
+		satasii satamv serprog \
 		internal dummy
 	_flashrom_enable wiki PRINT_WIKI
 
@@ -74,11 +79,15 @@ src_compile() {
 	fi
 
 	# WARNERROR=no, bug 347879
-	emake CC="$(tc-getCC)" WARNERROR=no ${args} || die
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" WARNERROR=no ${args} || die
 }
 
 src_install() {
 	dosbin flashrom || die
 	doman flashrom.8
 	dodoc ChangeLog README
+
+	if use doc; then
+		dodoc Documentation/*.txt
+	fi
 }