Enable all programmers that dont require extra external deps since the combined size is tiny. Simplify code in the process.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

2 files changed, 34 insertions, 46 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index cc3aca302e39..408e53c0e48e 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2011/03/06 08:51:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.13 2011/03/06 08:54:28 vapier Exp $
+
+  06 Mar 2011; Mike Frysinger <vapier@gentoo.org> flashrom-0.9.3.ebuild:
+  Enable all programmers that dont require extra external deps since the
+  combined size is tiny. Simplify code in the process.
 
   06 Mar 2011; Mike Frysinger <vapier@gentoo.org> -flashrom-0.9.2.ebuild:
   Old; punt.
diff --git a/sys-apps/flashrom/flashrom-0.9.3.ebuild b/sys-apps/flashrom/flashrom-0.9.3.ebuild
index 1f991ea8a0fa..8c7df1327190 100644
--- a/sys-apps/flashrom/flashrom-0.9.3.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.3.ebuild
@@ -1,22 +1,21 @@
 # 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.3.ebuild,v 1.4 2011/01/24 08:30:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.3.ebuild,v 1.5 2011/03/06 08:54:28 vapier Exp $
 
 EAPI="3"
 
 inherit toolchain-funcs
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="http://flashrom.org"
+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"
+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 )
@@ -36,14 +35,12 @@ 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
+	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() {
@@ -51,42 +48,29 @@ src_compile() {
 	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
+	flashrom_enable \
+		atahpt bitbang_spi buspirate_spi dediprog drkaiser \
+		ft2232_spi gfxnvidia nic3com nicintel_spi nicnatsemi nicrealtek rayer_spi \
+		satasii 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
-		prog=$(echo $prog | sed 's:^[+-]::')
-
-		[ "${prog}" = "internal" ] || [ "${prog}" = "dummy" ] || [ "${prog}" = "wiki" ] && continue
+	for prog in ${IUSE//[+-]} ; do
+		case ${prog} in
+			internal|dummy|wiki) continue ;;
+		esac
 
-		use $prog && progs=$((progs + 1))
+		use ${prog} && : $(( progs++ ))
 	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"
+	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