Version bump to 0.9.3. Add new useflags/features.

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

4 files changed, 136 insertions, 12 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index 7bc66ed03f36..b48c53c226ef 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/flashrom
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.7 2010/07/10 15:13:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.8 2010/12/03 17:25:28 idl0r Exp $
+
+*flashrom-0.9.3 (03 Dec 2010)
+
+  03 Dec 2010; Christian Ruppert <idl0r@gentoo.org> +flashrom-0.9.3.ebuild,
+  metadata.xml:
+  Version bump to 0.9.3. Add new useflags/features.
 
   10 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   flashrom-0.9.2.ebuild:
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 71b255f62815..51f3cdf1606f 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,14 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST flashrom-0.9.2.tar.bz2 209517 RMD160 6905a2958b781a93faa50b6423c7f201ac2bd48d SHA1 64dab463a23d329b80b4901180df77a853afd17a SHA256 6788efb3dfe4c6a2e0073f80a1952747bea82b1396b6369ca0d6e9a5cf5f269d
+DIST flashrom-0.9.3.tar.bz2 252146 RMD160 603a686ef32c884ef46e5334752776b56f64734b SHA1 d6208613780eb05d54bf103f0f5229405ebecd6b SHA256 e9efc85a1314e343c5e88a232c5f75e2b4233da0de99ab6c447f0ff6551488a0
 EBUILD flashrom-0.9.2.ebuild 2250 RMD160 0f47069b18b7602c4367ec5d1f692762c10d8913 SHA1 9697a0eb3aaf53335d4f7bf34ce740acc7c1fea5 SHA256 2ea4ef4f21d2fe22e985c12481051bf1f6dd11462aec95e4bebd8b17dbc9566d
-MISC ChangeLog 1557 RMD160 da93f317e3bb192afd5b418c3bc0300389ff6c20 SHA1 16dfc7651ea8854582a4d78159c563f444351f46 SHA256 43344dc1f0aa154a5375414ab8874625eee42d8c90b50e877e1ed7d40b62a247
-MISC metadata.xml 2636 RMD160 f7f6606c09875768a07ce89d98832f96a81464dd SHA1 fe3b17940a3214b7f870863630ec8890927ec4a1 SHA256 83bab53e86e2aea68d9f542e17ce751ad655afc625765956a9db262778a87c04
+EBUILD flashrom-0.9.3.ebuild 2965 RMD160 20e433f32f19b2b9b0e42023b7cd6c8216fbcdb9 SHA1 f2a185a8624b65ae165a90edaaadb488f103114c SHA256 45d5c3b5ec143e89708e6bbeb7f1e9a163aaacba6b566e6e836d9fcfe7ddbe2f
+MISC ChangeLog 1733 RMD160 7d2184e58ba9ada5b93d9e4e2860db1f2efde919 SHA1 89010993a96eb4169f3d9fa22f44bcee0e0d0c27 SHA256 218f65719268cff8ecc651c9d6299a8c67cbb0a01f507d06c95cd51d400b753c
+MISC metadata.xml 3339 RMD160 651ddfe60e00d4d73c058f9fd1f718d1b16e5310 SHA1 3eca375696ccde6e86bc842cb1ffa208ab90a9e8 SHA256 60bd89590e2997e8cbad012b364dbf98fff256424c8d54aa5d7453e6f7485b5e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkw4josACgkQNQqtfCuFneN33gCghQhRxlXd/3i6GBAPyGZsSZBm
-IWIAn3CBvQpy5BLFXZ31YefQ24jcIsdF
-=Bu9C
+iQEcBAEBCAAGBQJM+SgOAAoJEMOx0zmdw4Z1Ih4H/2Vu1F4ajtt5DA8l8NKzoBbY
+IGUfzEmqJlg4FjCMMNTzBP2aYpwnqCVTTaHFn4jmEbIpMuIVB5zeo5dggC6cnqH5
+4daHin9IIhouQBAG3Axy6qZI8mxUmIa6ac68G0pPBMsweCZm1ZeNFIALK4VOOrF4
+V9ruhzhtEXQk2NrULy7wP3qCNnF0q0tll5uROpluJhEDPN6n4Q5WCSRw9s4lEom6
+CZUyAHby5El2pYta/slBZ2Gz/Yd11G+x4+2MH+z575m6/tZfoPc1LPzY/Df0u5XO
+oj7LBgqLOwxykA4hLYnIvpVSHvG/5Vwxbv2txHNqnUJR1fJOtG8h6GfXfcIjPEc=
+=tl7I
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/flashrom/flashrom-0.9.3.ebuild b/sys-apps/flashrom/flashrom-0.9.3.ebuild
new file mode 100644
index 000000000000..9a1a2099a687
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-0.9.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 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.1 2010/12/03 17:25:28 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://qa.coreboot.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"
+
+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_spi? ( sys-apps/pciutils )
+	nicnatsemi? ( sys-apps/pciutils )
+	nicrealtek? ( sys-apps/pciutils )
+	rayer_spi? ( sys-apps/pciutils )
+	satasii? ( sys-apps/pciutils )"
+RDEPEND="${COMMON_DEPEND}
+	internal? ( sys-apps/dmidecode )"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils"
+
+_flashrom_enable() {
+	local flag=${1}
+	local macro=${2}
+
+	if use $flag; then
+		args="${args} ${macro}=yes"
+	else
+		args="${args} ${macro}=no"
+	fi
+}
+
+src_compile() {
+	local progs=0
+	local args=""
+
+	# Programmer
+	_flashrom_enable atahpt CONFIG_ATAHPT
+	_flashrom_enable bitbang_spi CONFIG_BITBANG_SPI
+	_flashrom_enable buspirate_spi CONFIG_BUSPIRATE_SPI
+	_flashrom_enable dediprog CONFIG_DEDIPROG
+	_flashrom_enable drkaiser CONFIG_DRKAISER
+	_flashrom_enable ft2232_spi CONFIG_FT2232_SPI
+	_flashrom_enable gfxnvidia CONFIG_GFXNVIDIA
+	_flashrom_enable nic3com CONFIG_NIC3COM
+	_flashrom_enable nicintel_spi CONFIG_NICINTEL_SPI
+	_flashrom_enable nicnatsemi CONFIG_NICNATSEMI
+	_flashrom_enable nicrealtek CONFIG_NICREALTEK
+	_flashrom_enable rayer_spi CONFIG_RAYER_SPI
+	_flashrom_enable satasii CONFIG_SATASII
+	_flashrom_enable serprog CONFIG_SERPROG
+
+	_flashrom_enable internal CONFIG_INTERNAL
+	_flashrom_enable dummy CONFIG_DUMMY
+	_flashrom_enable wiki CONFIG_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
+		prog=$(echo $prog | sed 's:^[+-]::')
+
+		[ "${prog}" = "internal" ] || [ "${prog}" = "dummy" ] || [ "${prog}" = "wiki" ] && continue
+
+		use $prog && progs=$((progs + 1))
+	done
+	if [ $progs -ne 1 ]; then
+		if ! use internal && ! use dummy; then
+			ewarn "You have to specify at least one programmer,"
+			ewarn "and if you specify more than one programmer you have to enable"
+			ewarn "either dummy or internal as well"
+			ewarn "'internal' will be the default now"
+			sleep 3
+			args="${args} CONFIG_INTERNAL=yes"
+		fi
+	fi
+
+	emake CC="$(tc-getCC)" ${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 15aae63020e4..1353e7bc04b9 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -14,13 +14,25 @@
 		<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>
+		<flag name="dediprog">Dediprog SF100 support</flag>
 		<flag name="drkaiser">Enable Dr. Kaiser programmer</flag>
 		<flag name="dummy">Enable dummy tracing</flag>
-		<flag name="ftdi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>
+		<flag name="ft2232_spi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>
+		<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="nvidia">Enable NVIDIA programmer</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="rayer_spi">RayeR SPIPGM hardware support</flag>
 		<flag name="satasii">Enable programmer for SiI SATA controllers</flag>
 		<flag name="serprog">Enable Serial Flasher programmer</flag>
 		<flag name="wiki">Enable wiki informations, like supported devices etc.</flag>
@@ -28,7 +40,7 @@
 	<longdescription lang="en">
 flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM images on mainboards, network/graphics/storage controller cards, and various programmer devices.
 
-    * Supports more than 225 flash chips, 128 chipsets, 186 mainboards, 19 PCI devices, 3 USB devices and all external programmers which use the serprog protocol.
+    * Supports more than 261 flash chips, 152 chipsets, 259 mainboards, 43 PCI devices, 5 USB devices and various parallel/serial port-based programmers.
     * Supports parallel, LPC, FWH and SPI flash interfaces and various chip packages (DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, TSOP48, and more)
     * No physical access needed, root access is sufficient.
     * No bootable floppy disk, bootable CD-ROM or other media needed.
@@ -37,6 +49,6 @@ flashrom is a utility for identifying, reading, writing, verifying and erasing f
     * Crossflashing and hotflashing is possible as long as the flash chips are electrically and logically compatible (same protocol). Great for recovery.
     * Scriptability. Reflash a whole pool of identical machines at the same time from the command line. It is recommended to check flashrom output and error codes.
     * Speed. flashrom is often much faster than most vendor flash tools.
-    * Portability. Supports DOS, Linux, FreeBSD, NetBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. Partial Windows support is available (full support as patch). 
+    * Portability. Supports DOS, Linux, FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. Partial Windows support is available (full support as patch).
 	</longdescription>
 </pkgmetadata>