Version bump. Also disable some unsupported programmers by default.

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

5 files changed, 130 insertions, 18 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index b595802022f0..a151be553a05 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/flashrom
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.25 2012/06/16 08:53:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.26 2012/08/03 19:32:48 idl0r Exp $
+
+*flashrom-0.9.6 (03 Aug 2012)
+
+  03 Aug 2012; Christian Ruppert <idl0r@gentoo.org> +flashrom-0.9.6.ebuild,
+  flashrom-9999.ebuild, metadata.xml:
+  Version bump. Also disable some unsupported programmers by default.
 
   16 Jun 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Leio is second maintainer as talked with him.
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 6553cfb2eec3..a821e7e96b6f 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,17 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST flashrom-0.9.4.tar.bz2 293396 RMD160 b8742aae4d631a04c0fe8c8227b95fc9e7092a1d SHA1 93d727f3144e0a43cc2e792e40a37c97781a6257 SHA256 30e5a61a09160f142fdeec4a6c83cca495d7f2a9fc2eef480646889c3e9f0b3a
-DIST flashrom-0.9.5.2.tar.bz2 347242 RMD160 dba65b6f12370eb686321e937e00479aff4a3739 SHA1 483c16a4a8bb7ceec8ea439b13e2b97d669deb25 SHA256 9a5ccd1c4bf6d7658e9373426a3683fab1d260eabf4542de3b6ebd1882ac4903
-EBUILD flashrom-0.9.4.ebuild 2617 RMD160 4cf8369a76454df2b4c70f16dd2e8e147e7c2bc8 SHA1 a9545feb0a1c291561d11cfbf3de6a8f2675467b SHA256 67f753cbab7adcd13ce5acb4e5660a5a1229cd99e85fbfb9008cd435be7c8bd8
-EBUILD flashrom-0.9.5.2.ebuild 2787 RMD160 2d7de055bbabb1359764b1e845fed5746518ec8d SHA1 2e124c347dddfef13069128d74afd3b405cf63aa SHA256 8f4ace425af4f31f09d763e727f453e42c279124cefabdf4951d61d4e085355f
-EBUILD flashrom-9999.ebuild 2787 RMD160 cc2c5d2b571240e961a762ea587391b7df43ca18 SHA1 ede7f9ba767fd21770e26bb35005a4dcc966e8df SHA256 c9677fbe1e6bacfd74b7bfd8dfbae5042f4aed81831c25433a92c9b5a29af602
-MISC ChangeLog 3910 RMD160 6278c1cfbcbb214139f8dea340701e0e0879144f SHA1 ad117d2d71bbe90505ce8fc79af44bc2fa4654bc SHA256 fe9c048e0a1eda0fa003f669ce929e22480c1c0b5691dc52f9e8e3bb1ce7b7dd
-MISC metadata.xml 3293 RMD160 c3e0a91ed8a543fbb6f73fde43196e377e29de78 SHA1 9ffba0cb2223a711b607e584541acc506a3b3d63 SHA256 ced5eb8d9107977d2f0d71d092889152e456a67a4169ab0066e914a4c80e49e6
+DIST flashrom-0.9.4.tar.bz2 293396 SHA256 30e5a61a09160f142fdeec4a6c83cca495d7f2a9fc2eef480646889c3e9f0b3a
+DIST flashrom-0.9.5.2.tar.bz2 347242 SHA256 9a5ccd1c4bf6d7658e9373426a3683fab1d260eabf4542de3b6ebd1882ac4903 SHA512 cfbf00302fb804832d5bf63621b0fa2eb548981c2a208e0bb55a1fd04248744314028dc353dc7ad1b2f66480617683a265f47af15141d458ae442a83174b9bb0 WHIRLPOOL 464acf9fbd9f4bfbee26ab4f16af5dbf52ed764c25d550c032fc9cbf53f1f4167a780ae7adf6824e32a268edb471d3e2668192eb2cb13b89d0ec86eb76085571
+DIST flashrom-0.9.6.tar.bz2 367897 SHA256 1e70af228b1d4d3244786de2e6eaa44f0d967ccff002ec4209f9badba8ce941f SHA512 3ce2aa5b2de8075bc7871f48f46d1d177a1956d3ac8c6252b4b09b2226c9d62023067d58bcdf5a65fe8cbe1a07c0946e2d15ed4cc23385d8d28ae8bdde37cf98 WHIRLPOOL 3a1661feb9b55e9a050073675726d00c81667ef3db966bed4354750bc52542cad6f07dcf2ceeb241ba9859da80093f3828a31d1ac9515278baf9f6c33300c7f3
+EBUILD flashrom-0.9.4.ebuild 2617 SHA256 67f753cbab7adcd13ce5acb4e5660a5a1229cd99e85fbfb9008cd435be7c8bd8 SHA512 a2fc0cbfe62a11648126082a237c0e21c091a66ec2b1e12abd9bd7dcd247ee519f07b9d06d2a82cacccb7149a4dfa436308a5094d2c00af5f995e55591a2189a WHIRLPOOL 2c1ed13da25aaeaef6133bd6adfcf7682b536c567b47a001688e61e38f91e927509cc754caba7b830b48f4b45a7bc5ffb7319122a4264775b99c502e7a705b52
+EBUILD flashrom-0.9.5.2.ebuild 2787 SHA256 8f4ace425af4f31f09d763e727f453e42c279124cefabdf4951d61d4e085355f SHA512 63aed28719681875a667d265a23552bbb0aae85120ef3219266d9f9a7f134ed50c70adf4464029f694e7823add20a73f9e67af640dea44291d2c704899d5c704 WHIRLPOOL 8504b0bfb90bb3b2db283070c0122632e14c472d83e60d22117f8c4a9ce206527487e32441064922ecef402ba7fedf2fa1dad4bd67ab2e8e1101d49e0446e844
+EBUILD flashrom-0.9.6.ebuild 2803 SHA256 f6774c38114387de2a7130d41b4867b246c69389af045edc200b58f8de7a5cba SHA512 2de716857e6ab12553323e65cb1b6fc384ff539f77d0f7756d7a52cf2e5379c28234907426aba17f984872764170c874d9e94298159de07ccca54edea8c64b1d WHIRLPOOL 3f691ddbfceced975ebe068edf8faecc6375e24352bbeba258c81e78ec6273d441584586969a948565edfd55a42ba8aaa9d15109166275c4f2cd57c99ac786ee
+EBUILD flashrom-9999.ebuild 2802 SHA256 aba2482856a8b2365ea1a79ac24ed8bdddfddf0c74cdce8cd85e1408c1a850f8 SHA512 a127a96169df494b74318ebe89a705e4e2b8c0aa1c2e6c8dae121e37c2c179520715d0a98dca28149df65807b1e789857b91921c1139b17364f90d3e07bdbdf8 WHIRLPOOL c25f3089a3f51f8eb1f2620d43e2d22d84367017ff60c286d048e5dc1715fab520f585bb819918e31bd310174da6756d6507846019786db6cf710fc1a3df292e
+MISC ChangeLog 4126 SHA256 71b376e73ccd903895744294b0b9076a2130f49879fd5f6fe4c8843c45bda25c SHA512 54a4174327175cf3e81bf6ad8660f44473dd6af6417a6cf12b5a505f9824b2f01664474ddb655e2584bcc89d0cb629492373d8c560a36e5c05f2aeeb68d63b7d WHIRLPOOL e8ad60090e71e0f84790ab1a6fcccc32d63e39f28bfe20115dd2e3d07871f12f1ca4526ca6687df873ebf8d413986a3d04d61ca458f9124e949598b0882630d4
+MISC metadata.xml 3375 SHA256 f4d251398f267e154f0ecf6f64728d39294a06a5072792f94e00887d43cafa46 SHA512 a7b084457c11ac2d0087726aeb0de1b8f0412c958cbfad893bbad7fe1d67a1fbb7aaa0b5a2cd284d5560229ba1f8c44272435816f732d2dd1839e198d3037b1a WHIRLPOOL 1b592dc1c9826e7042017ee24748387ee592e3752db4483be2c5608c1ca71fbbb2d3c0ffe39b2aa46dcfeaa0812661a5eba6054a84e1ef81030ee95d90f55121
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/cSYoACgkQCaWpQKGI+9T/NQCfRPKVs9e4v/bqVVNiPQbiF5uE
-S5EAn3/pc5cBAvz2gl2lrudObko0pUQY
-=DVYH
+iQEcBAEBCAAGBQJQHCduAAoJEMOx0zmdw4Z1k0EIAISmSplKtGUxS0Yh2pejyJFK
+690ZjhnLmJZkvrH0tsM4Rozv8lJHOuA9qzx7DyC3+JaAF9SrPAYXlT31MnkWX4m1
+hBtlUN/VyCaKg3AuZfqv7gjfgwqDrtgPQ9+hViaWdlZ3LIiPXRw03+i+9/+foFF2
+AJmq5j13ShrqiBUyvVmgD5Cn/oXylFZ5vKCYnzkr2K7xguLxdlFdFJ7IrxrClbG6
+DUdEaFONLH1mr7Hj8/nosSfRvIR2W3D0h0blIWWK/NGDCzJt+6Cdab49dy7Bb4LB
+41Xugg+tHs8PyMuOgn1ypVuAlxKDrQfj2RBUeFlrrhdmJNJERgugOr154Tct8e0=
+=tNAA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/flashrom/flashrom-0.9.6.ebuild b/sys-apps/flashrom/flashrom-0.9.6.ebuild
new file mode 100644
index 000000000000..4b99cf332411
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-0.9.6.ebuild
@@ -0,0 +1,99 @@
+# 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.6.ebuild,v 1.1 2012/08/03 19:32:48 idl0r Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="svn://coreboot.org/flashrom/trunk"
+	inherit subversion
+else
+	SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
+HOMEPAGE="http://flashrom.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atahpt +bitbang_spi +buspirate_spi +dediprog doc +drkaiser
++dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel +nicintel_spi
+nicnatsemi nicrealtek +ogp_spi rayer_spi
++pony_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=$(usex $1 yes 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 pony_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."
+			args+=" CONFIG_INTERNAL=yes"
+		fi
+	fi
+
+	# WARNERROR=no, bug 347879
+	tc-export AR CC RANLIB
+	emake WARNERROR=no ${args} || die
+}
+
+src_install() {
+	dosbin flashrom || die
+	doman flashrom.8
+	dodoc ChangeLog README
+
+	if use doc; then
+		dodoc Documentation/*.txt
+	fi
+}
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 10496be628ad..f2c553078623 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.2 2012/03/02 01:47:54 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.3 2012/08/03 19:32:48 idl0r Exp $
 
 EAPI="4"
 
@@ -18,10 +18,10 @@ HOMEPAGE="http://flashrom.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog doc +drkaiser
+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"
+nicnatsemi nicrealtek +ogp_spi rayer_spi
++pony_spi +satasii satamv +serprog +wiki"
 
 COMMON_DEPEND="atahpt? ( sys-apps/pciutils )
 	dediprog? ( virtual/libusb:0 )
@@ -60,7 +60,7 @@ src_compile() {
 	flashrom_enable \
 		atahpt bitbang_spi buspirate_spi dediprog drkaiser \
 		ft2232_spi gfxnvidia nic3com nicintel nicintel_spi nicnatsemi nicrealtek \
-		ogp_spi rayer_spi \
+		ogp_spi rayer_spi pony_spi \
 		satasii satamv serprog \
 		internal dummy
 	_flashrom_enable wiki PRINT_WIKI
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index e53bc690fa1f..90ed85dc2af2 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -28,6 +28,7 @@
 		<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="pony_spi">Enable support for SI-Prog like hardware by Lancos</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>