Version bump, bug 284543.

dquote> Add ftdi and serprog useflag.
dquote> Update longdesc in metadata.xml.
(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 73 insertions, 51 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index 9efe77da870b..5707418a74da 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/flashrom
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.2 2009/05/08 23:17:46 leio Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.3 2010/01/28 20:04:28 idl0r Exp $
+
+*flashrom-0.9.1 (28 Jan 2010)
+
+  28 Jan 2010; Christian Ruppert <idl0r@gentoo.org> -flashrom-0.9.0.ebuild,
+  +flashrom-0.9.1.ebuild, metadata.xml:
+  Version bump, bug 284543.
+  Add ftdi and serprog useflag.
+  Update longdesc in metadata.xml.
 
   08 May 2009; Mart Raudsepp <leio@gentoo.org> flashrom-0.9.0.ebuild:
   Fix homepage, pointed out by Anton Bolshakov
diff --git a/sys-apps/flashrom/flashrom-0.9.0.ebuild b/sys-apps/flashrom/flashrom-0.9.0.ebuild
deleted file mode 100644
index d043694c7aab..000000000000
--- a/sys-apps/flashrom/flashrom-0.9.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.0.ebuild,v 1.2 2009/05/08 23:17:46 leio Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips."
-HOMEPAGE="http://www.coreboot.org/Flashrom"
-SRC_URI="http://qa.coreboot.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-src_prepare()
-{
-	sed -i -e '/STRIP/d' \
-		-e "s:-Os -Wall -Werror:-Wall ${CFLAGS}:" \
-		-e "s:LDFLAGS = :LDFLAGS = ${LDFLAGS}:" "${S}/Makefile" || die "sed failed"
-}
-
-src_compile()
-{
-	emake -j1 CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README
-}
diff --git a/sys-apps/flashrom/flashrom-0.9.1.ebuild b/sys-apps/flashrom/flashrom-0.9.1.ebuild
new file mode 100644
index 000000000000..54727cd8b9ec
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-0.9.1.ebuild
@@ -0,0 +1,53 @@
+# 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.1.ebuild,v 1.1 2010/01/28 20:04:28 idl0r Exp $
+
+EAPI="2"
+
+inherit flag-o-matic 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="ftdi serprog"
+
+RDEPEND="sys-apps/pciutils
+	ftdi? ( dev-embedded/libftdi )"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_prepare() {
+	# We don't need zlib here
+	# Disable auto-deps
+	sed -i -e 's:^LIBS +=.*:LIBS += -lpci:' \
+		-e 's/^all:.*/all: dep $(PROGRAM)/' \
+		-e 's/^\.features:.*/\.features:/' \
+		Makefile || die
+}
+
+src_compile() {
+	if use ftdi;
+	then
+		append-cflags "-DFT2232_SPI_SUPPORT=1"
+		export LIBS="-lftdi"
+	fi
+	if use serprog;
+	then
+		append-cflags "-DSERPROG_SUPPORT=1"
+	fi
+
+	# Get a rid of "grep: .features: No such file or directory" warnings
+	touch .features
+
+	emake CC="$(tc-getCC)" STRIP="" || die "emake failed"
+}
+
+src_install() {
+	dosbin flashrom || die
+	doman flashrom.8 || die
+	dodoc ChangeLog README
+}
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 95ca007e5b2e..e94021f7f8b2 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -9,23 +9,22 @@
 	<email>peter@stuge.se</email>
 	<description>Please CC on all bugs</description>
 </maintainer>
+<use>
+	<flag name="ftdi">Enable flashing through FTDI/SPI USB interface</flag>
+	<flag name="serprog">Enable Serial Flasher support</flag>
+</use>
 <longdescription lang="en">
-flashrom is a utility for reading, writing, verifying and erasing flash ROM chips. It's often used to flash BIOS/coreboot/firmware images.
+flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It's often used to flash BIOS/EFI/coreboot/firmware images.
 
-Highlights of flashrom include:
-
-    * Supports parallel, LPC, FWH and SPI flash interfaces.
-    * Supports more than 150 flash chip families and half a dozen variants of each family.
-    * Flash chip package agnostic. DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40 and more have all been verified to work.
-    * Supports more than 75 different chipsets, some with multiple flash controllers.
-    * Features special mainboard enabling code for dozens of nonstandard mainboards.
+    * Supports more than 195 flash chips, 75 chipsets, 130 mainboards, and 17 devices (PCI or USB) which can be used as external 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.
     * No keyboard or monitor needed. Simply reflash remotely via SSH.
-    * No instant reboot needed. Reflash your ROM in a running system, verify it, be happy. The new firmware will be present next time you boot.
+    * No instant reboot needed. Reflash your chip in a running system, verify it, be happy. The new firmware will be present next time you boot.
     * 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 much faster than most vendor flash tools.
-    * Supports Linux, FreeBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes. 
+    * Speed. flashrom is often much faster than most vendor flash tools.
+    * Portability. Supports Linux, FreeBSD, DragonFly BSD, Solaris, Mac OS X, and other Unix-like OSes.
 </longdescription>
 </pkgmetadata>