Version bump

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

3 files changed, 115 insertions, 5 deletions

diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index d6526b603dd0..0040ae9dc360 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,11 @@
 # 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.27 2012/10/25 14:27:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.28 2012/10/25 19:03:49 idl0r Exp $
+
+*flashrom-0.9.6.1 (25 Oct 2012)
+
+  25 Oct 2012; Christian Ruppert <idl0r@gentoo.org> +flashrom-0.9.6.1.ebuild:
+  Version bump
 
   25 Oct 2012; Anthony G. Basile <blueness@gentoo.org> flashrom-0.9.6.ebuild:
   stable arm, bug #439552
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 09117a8d4a1c..93ba9eec3ece 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -3,17 +3,23 @@ Hash: SHA256
 
 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.1.tar.bz2 368133 SHA256 6f7b588cce74c90b4fe9c9c794de105de76e0323442fb5770b1aeab81e9d560a SHA512 335243ca869a49521b6404004496cdba16f11da4f5321bbc8786635bbc7a0fe7215de2015d67200da68d398ed270d9a2ad9308ca9f762790e39b9f0602e53529 WHIRLPOOL f55f53cc6f06b627d8561e369bca32f1b62dc8de9a35963c01575b31f3190cf1be3b7114db8552b7f9f87c971960f1d16fe284d44e8d2db3da2996431d08598c
 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.1.ebuild 2805 SHA256 ef100e602395cb2b888660cd3842bccc67befa3c15207831ae2fdd707d0df2a6 SHA512 d14aa1139c4d46baa184e58a238f06a4af8ec8f2844e46fbd5f923dfdea4eebd38a908806b38560f43141d7921a2e57834b3077b09330376961a62c8832dd767 WHIRLPOOL 91b60d68a2309ac470e9e6d1abc02afd8d25987cd935287eaa4bfdd3cdcd63d296e6534482eb72e99a1166687176d207318c1e9a94dedb9356c14264e5c11aa5
 EBUILD flashrom-0.9.6.ebuild 2805 SHA256 5faab35e1c72ab7af56a6b2983d6a217ea8d17bc9aac5955e7df5f5cde1b8d20 SHA512 507a38a70be307d9e780fb3c88cf0e0cbde670d7bb6a0103390df2febdf0ca6fa6cdbfa7f26c6ebcfbfbd5f6a461e08229ef9cdfa5249c6ad8ecf75b05397805 WHIRLPOOL f197508c93506d9797fa2247e9dd0abf2ebd6d84f56c4e84880ac7810d3c14effa4f51955305e609f827583154a08fd0ca1c406a31c68b602a7c334985c44090
 EBUILD flashrom-9999.ebuild 2802 SHA256 aba2482856a8b2365ea1a79ac24ed8bdddfddf0c74cdce8cd85e1408c1a850f8 SHA512 a127a96169df494b74318ebe89a705e4e2b8c0aa1c2e6c8dae121e37c2c179520715d0a98dca28149df65807b1e789857b91921c1139b17364f90d3e07bdbdf8 WHIRLPOOL c25f3089a3f51f8eb1f2620d43e2d22d84367017ff60c286d048e5dc1715fab520f585bb819918e31bd310174da6756d6507846019786db6cf710fc1a3df292e
-MISC ChangeLog 4233 SHA256 b808fb1b5e6cbfb7dbed5cc59cbfcf428980d8c8a7e871a0b56a53f33656af42 SHA512 bf88652b0ce446be5fa4da98ca0a712f2212dff0dfc9454379e81b4b62ed1955e82844e57e1a1ec69017051fa4a4e569f5449ac2f1e288ee84e30a19fb163ec8 WHIRLPOOL 53ae20d0f388748cc7ecbf107901238c459ca3cd61c57711a73d267cc52380fbc42cda72d455f4a727a500d078fa206c91f9fcf627ec5a91c0e2d4aacfe3311e
+MISC ChangeLog 4357 SHA256 ac75d0cdddcf90532485967c966dbf2fec9d68564fc4d80249fc4747d8e496e7 SHA512 48335ebbf848646bacc8020c669ec8dffaece9bb5a42cdcf02d84d0ba1020559a2afbd624e6b1b10d05b2e012e321861989f8993f49769be74636c84ad77ffa6 WHIRLPOOL 801665b26c81225ccc8eafd391a65338bca288533681343ef692c26be70065acd92eddcdece30deac1a54f0b4a08b91fad4ac697d6fc7ae120b92881b7e4c4dd
 MISC metadata.xml 3375 SHA256 f4d251398f267e154f0ecf6f64728d39294a06a5072792f94e00887d43cafa46 SHA512 a7b084457c11ac2d0087726aeb0de1b8f0412c958cbfad893bbad7fe1d67a1fbb7aaa0b5a2cd284d5560229ba1f8c44272435816f732d2dd1839e198d3037b1a WHIRLPOOL 1b592dc1c9826e7042017ee24748387ee592e3752db4483be2c5608c1ca71fbbb2d3c0ffe39b2aa46dcfeaa0812661a5eba6054a84e1ef81030ee95d90f55121
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCJTAcACgkQl5yvQNBFVTU5NACeLVDrO8AtilRZSa2LODYyWrZM
-70YAnRY33fh0LBlA+mfhpVboAwrpaJ5q
-=pgYC
+iQEcBAEBCAAGBQJQiY0WAAoJEMOx0zmdw4Z1IesIAKqmvfmCOBsAuoFuE4R4OO2G
+m/opWbLyYTkozEvGELbSdXlXguEj+FLr2oC6OHViPGzRx+sXQ5PcUiHCGq5rqK23
+2Jm8RaiWB4JFw9yrqg8CUHg2rH2yY03Fi9hXsvwQN1tioM/hFkowlTN6SxbfKtUF
+QgqyDaYYpVHNGCxhpjr9RbIRvpzmOywBrxxrGeimhkLU5huE57d3EvcRfDMfkpj7
+ANR1cpSUm8O9W31/7WI0m+jPwcE8qGsmWJPj7/jR9NgtHwOpyPsp6es3BpoJ6N7h
+C5/Mjb2eLjG+8s8tPCpjwkH8dJcsz6HGmaC2VuCTov8TnsOYdCnsNAj9JYMm/EM=
+=MsPM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/flashrom/flashrom-0.9.6.1.ebuild b/sys-apps/flashrom/flashrom-0.9.6.1.ebuild
new file mode 100644
index 000000000000..e33604e2c0d0
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-0.9.6.1.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.1.ebuild,v 1.1 2012/10/25 19:03:49 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
+}