Version bump to 0.9.4.

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

4 files changed, 118 insertions, 8 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index 408e53c0e48e..f0e9cc599fe4 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.13 2011/03/06 08:54:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.14 2011/07/30 17:18:58 idl0r Exp $
+
+*flashrom-0.9.4 (30 Jul 2011)
+
+  30 Jul 2011; Christian Ruppert <idl0r@gentoo.org> +flashrom-0.9.4.ebuild,
+  metadata.xml:
+  Version bump to 0.9.4.
 
   06 Mar 2011; Mike Frysinger <vapier@gentoo.org> flashrom-0.9.3.ebuild:
   Enable all programmers that dont require extra external deps since the
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index b26d243b23ca..134e1d9a6ca3 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,4 +1,20 @@
+-----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 2468 RMD160 6317e6408702c53e9d3be509c0e474db4b2b3770 SHA1 40bd12839f1b177b9eb8be74cc21dc1d4ac3c80b SHA256 3c4ec3b85ce3efd932d3e188ee39bbbbef31405a0b236523b82f75dccec335b1
-MISC ChangeLog 2353 RMD160 f0e26622062bcbcdbc19b50576419fb8d33b73bc SHA1 de6b4825e667e03fa7a5ea4173252da2da7a0fdd SHA256 7d068f91bd8ca36e569449ad56b08eec6825e64109940ecb41763de6ae47bf87
-MISC metadata.xml 3339 RMD160 651ddfe60e00d4d73c058f9fd1f718d1b16e5310 SHA1 3eca375696ccde6e86bc842cb1ffa208ab90a9e8 SHA256 60bd89590e2997e8cbad012b364dbf98fff256424c8d54aa5d7453e6f7485b5e
+EBUILD flashrom-0.9.4.ebuild 2626 RMD160 6f97c26ae4bb02761503f0105a87f23af9f0cead SHA1 3251c18a7f21a64f323f371333c0aa024f80a70e SHA256 3110a9ce90e03cd3bb6cc1be36375dd90f552eb5f544122814df2e021f15394e
+MISC ChangeLog 2501 RMD160 a929ca6c58663f99228100f6576f024cef8d45c3 SHA1 67ae7608014f25285be5d97fa5f430e021eb61ff SHA256 4904191d2f5f283275abafc00e230bc9523cabdacecfbb3302a48c2d14464666
+MISC metadata.xml 3314 RMD160 214a51b38c14f729b93937c2ebadf090e0a402b5 SHA1 37891dde81f48b4cadff2ddbc9ad194f997c754d SHA256 f2b93d6a7566b604fb71256d17ac5ca8a8f83a1a5e7dcb4bdb0601b2f28ce5ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJOND0IAAoJEMOx0zmdw4Z11UgIALLUXhldP8PzKc+nPQBwQyY0
+1+1ipmqv+j2w4R0X8ZlZ6LSU22MVXlDqIIjWPRJgYfl10+7hHVKIhpr2Ky77Gk5W
+wf5P5znWU3kqbXNL1yYIqodh//RTFt+bPJz+1gcCiejeEnNfmf/jwi18U8otun+C
+98HAG9GEqUM0YH4w3ZTVY9bv035wusvlMaXPSu3AXdivIuFzmmrQ3MakqsPTUKhR
+HMJNmqJkGFSgoQOB40Ic5lJOze3iqWIStGrSJVx8F38yro0Mk6NLDXrnv0KRclMC
+s4AReWZ2+DgHsCHtaUHxIbxiIc30ZOJhSOdCLPLc2G+M4RNbudc8BGZTlUMJA/c=
+=6bQ4
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/flashrom/flashrom-0.9.4.ebuild b/sys-apps/flashrom/flashrom-0.9.4.ebuild
new file mode 100644
index 000000000000..93aa042dd0f1
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-0.9.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.4.ebuild,v 1.1 2011/07/30 17:18:58 idl0r Exp $
+
+EAPI="3"
+
+inherit toolchain-funcs
+
+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 +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 )
+	drkaiser? ( sys-apps/pciutils )
+	ft2232_spi? ( dev-embedded/libftdi )
+	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 )
+	satamv? ( sys-apps/pciutils )
+	ogp_spi? ( sys-apps/pciutils )"
+RDEPEND="${COMMON_DEPEND}
+	internal? ( sys-apps/dmidecode )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+
+_flashrom_enable() {
+	local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}"
+	args+=" $c=`use $1 && echo yes || echo no`"
+}
+flashrom_enable() {
+	local u
+	for u in "$@" ; do _flashrom_enable $u ; done
+}
+
+src_compile() {
+	local progs=0
+	local args=""
+
+	# Programmer
+	flashrom_enable \
+		atahpt bitbang_spi buspirate_spi dediprog drkaiser \
+		ft2232_spi gfxnvidia nic3com nicintel nicintel_spi nicnatsemi nicrealtek \
+		ogp_spi rayer_spi \
+		satasii satamv serprog \
+		internal dummy
+	_flashrom_enable wiki PRINT_WIKI
+
+	# You have to specify at least one programmer, and if you specify more than
+	# one programmer you have to include either dummy or internal in the list.
+	for prog in ${IUSE//[+-]} ; do
+		case ${prog} in
+			internal|dummy|wiki) continue ;;
+		esac
+
+		use ${prog} && : $(( progs++ ))
+	done
+	if [ $progs -ne 1 ] ; then
+		if ! use internal && ! use dummy ; then
+			ewarn "You have to specify at least one programmer, and if you specify"
+			ewarn "more than one programmer, you have to enable either dummy or"
+			ewarn "internal as well.  'internal' will be the default now."
+			ebeep 3
+			args+=" CONFIG_INTERNAL=yes"
+		fi
+	fi
+
+	# WARNERROR=no, bug 347879
+	emake CC="$(tc-getCC)" WARNERROR=no ${args} || die
+}
+
+src_install() {
+	dosbin flashrom || die
+	doman flashrom.8
+	dodoc ChangeLog README
+}
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 1353e7bc04b9..3970fe71a261 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -14,11 +14,6 @@
 		<description>Please CC on all bugs</description>
 	</maintainer>
 	<use>
-		<!-- flashrom 0.9.2 only -->
-		<flag name="buspiratespi">Enable Bus Pirate SPI programmer</flag>
-		<flag name="ftdi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>
-		<flag name="nvidia">Enable NVIDIA programmer</flag>
-
 		<flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag>
 		<flag name="bitbang_spi">Bitbanging SPI infrastructure</flag>
 		<flag name="buspirate_spi">Enable Bus Pirate SPI programmer</flag>
@@ -29,11 +24,14 @@
 		<flag name="gfxnvidia">Enable NVIDIA programmer</flag>
 		<flag name="internal">Enable internal/onboard support</flag>
 		<flag name="nic3com">Enable 3Com NIC programmer</flag>
+		<flag name="nicintel">Support for Intel NICs</flag>
 		<flag name="nicintel_spi">Support for SPI on Intel NICs</flag>
 		<flag name="nicnatsemi">Support for National Semiconductor NICs</flag>
 		<flag name="nicrealtek">Support for Realtek NICs</flag>
+		<flag name="ogp_spi">Enable support for OGP (Open Graphics Project) SPI flashing</flag>
 		<flag name="rayer_spi">RayeR SPIPGM hardware support</flag>
 		<flag name="satasii">Enable programmer for SiI SATA controllers</flag>
+		<flag name="satamv">Enable programmer for Marvell SATA controllers</flag>
 		<flag name="serprog">Enable Serial Flasher programmer</flag>
 		<flag name="wiki">Enable wiki informations, like supported devices etc.</flag>
 	</use>