Punt older 2.5.x, version bump 2.5.3 and 2.6.1

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 43 insertions, 21 deletions

diff --git a/net-misc/bfgminer/ChangeLog b/net-misc/bfgminer/ChangeLog
index 0e6272ac8bde..cc3f81330eb1 100644
--- a/net-misc/bfgminer/ChangeLog
+++ b/net-misc/bfgminer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/bfgminer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/ChangeLog,v 1.15 2012/07/31 01:45:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/ChangeLog,v 1.16 2012/07/31 01:57:54 blueness Exp $
+
+*bfgminer-2.6.1 (31 Jul 2012)
+*bfgminer-2.5.3 (31 Jul 2012)
+
+  31 Jul 2012; Anthony G. Basile <blueness@gentoo.org> -bfgminer-2.5.0.ebuild,
+  -bfgminer-2.5.1.ebuild, +bfgminer-2.5.3.ebuild, +bfgminer-2.6.1.ebuild:
+  Punt older 2.5.x, version bump 2.5.3 and 2.6.1
 
   31 Jul 2012; Anthony G. Basile <blueness@gentoo.org> -bfgminer-2.3.4.ebuild,
   -bfgminer-2.3.5.ebuild, -bfgminer-2.4.0.ebuild, -bfgminer-2.4.1.ebuild,
diff --git a/net-misc/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 61745ce1b73c..f6889c82a480 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX Bugfix-Fix-building-without-OpenCL-support.patch 730 SHA256 4b6d2c1e1b013215f325fe673bde0b161bd8eaea89e721a129cad8e051d6a054 SHA512 c0bb0e0119ab5586fca0626fcf9351cd4b1ff26811d0f05851747c66d9cbacb635ec14cecb9843771bf3f5e29c82313a1feeea387f2f91e85ae01c02e889ae0a WHIRLPOOL 9137171200de11eff964945818cdbe06b5f5a41d62171d334e01cbe023a7684a6392e767f80e8e7ffc3e80a5d7de493344f07a69aedaea8146e216962eda2568
 DIST bfgminer-2.3.6.tbz2 4651689 RMD160 7b3f8d56f7b9bc1fa19825a4c77abcbe307a74c3 SHA1 beecf2d2afc124f4bdb55619002305d48aa5177e SHA256 e55b50cc2e1e77de09a5debfdffabe05fa82307c8b93fabf914823f27e24cf78
 DIST bfgminer-2.4.4.tbz2 6009722 SHA256 247a8e56c4982e0ea1f7e98567ae73be9c8a5a7ae7cb3b1a97c53cdd007ab22c SHA512 76048d63350d6ef7ae6961687bd273f53105b9e46b0caf36b521f7527580310bc357ab973db658149f1a176e5dde06ab630f6bd1eedd1953cbd1150df3880809 WHIRLPOOL 8e2eedef1f14f27daa259857605f018fe58180727f8907ceb966ac348b6d42c9cc27f84c5b73c3eb64e5daccf76e95c221a798cf5f714686f940ae10af8326dd
-DIST bfgminer-2.5.0.tbz2 6015548 SHA256 81a23270cac2ad49c5ca70f498c1194d245fff6aba5f3b9e5ef1f3e6fa1c9482 SHA512 6c4517ef36300d68ea721be63380c491932b01666d49dad87f4d1752b70606b6abe2e4a30c5b5ce0b72b9a029a588503ac9dee1f9d9e9b3fefd483ccdda37bdc WHIRLPOOL 3aa165a96cfc60ad126bb17dcb989682be3dd46f556caa7c71791da5e49e87129dd139c3c476894837f4c035a30657d6372a34ef9a79979baccb20ae56b9e543
-DIST bfgminer-2.5.1.tbz2 6016469 SHA256 5f250e81edb9232a6b7d2934ac932ed07ce052747fc0378e7d02eafdeaa43e43 SHA512 9589ae970d143f25ed5e271f70a2cebe7c55bd1836397977058b64bf9e44c49cc4201f11c056e9b3d31e91231897125c27744422af02ff6e0eafbcee0244b91a WHIRLPOOL 493d587b3b0518e8fccdaa70efbab8c5ee3d0e8bce841a160461f6ee5804ae05e684f17d0641264e3ba94b57015ecf89f403e8641377c865f6a4e415a5b931bc
+DIST bfgminer-2.5.3.tbz2 6019655 SHA256 c1a24d5ca5d53f424c4254a195366a3e778092413771dbeb1d100ac33711c4bb SHA512 489b137adcac75d32d2e817db79077354a7e9a76c7ca00ebeb7722d731cccb0e28231c39a626a1f57b057591d2da313d2a8593fc7992b9d316b8a314b0b05cda WHIRLPOOL d24bd9bc40f4f8993a7e17bc1cc8d383519dedb3e82123ac1ead72ef70c3e63457d62d7c40fc6f63fcc0346436ba0c030672d0adff561216b195f2560652c92a
+DIST bfgminer-2.6.1.tbz2 6070480 SHA256 2f9e27601e92f97aa4df599e2c14a2b8f5231a2074ee63c35ea783514175a558 SHA512 be6ebe4eaeb00d272de0af1cfd569127580eda704e557ae673c038e5831b56786f40221bb41282edbde2be9d0ee78aff92605b8d7f3b58d9a0767c5cd8556e7e WHIRLPOOL a3c048f8aed0be1e41919f1e488308b2aa5de5304ba0034cff14bfd375f0eaedb4e323bcac28f8815a68da7e8541526f42df620d1ed4b2824d4421912f4f8676
 EBUILD bfgminer-2.3.6.ebuild 2635 SHA256 381c852fcdec8fd92b8140952d283fc0c56822f3909e2b6bde24057fd5e761f1 SHA512 a3aee0d05273cc90ee528a23d9693d3709e634a45d5e288d6155c23078ef20b8b32f0d1949d0d44da50f95995f8cae0e4feddec592e4e465b0fdfec2ad909988 WHIRLPOOL c344c86f0a678b36ff9e0cd4d4e570728393bd2d8fba72341dd13040d5412c1262980df2f476604105a21a53442ff33d46fc0b120055a1e86fa510ecb127f30f
 EBUILD bfgminer-2.4.4.ebuild 2756 SHA256 3575301d836cbca702f054874ba5a584919001024a3438ac76035fe22275d84c SHA512 22c41a120f83314c3b46840c773d29b67cb92fd6f07d3bf62edf1c284dc69fcb7e19a4064b49be123246216577113ffaecb0a2c5e170ed9f1d2fdb926c530782 WHIRLPOOL b0d46629502e670928ead59c5f544fbdb818ed3f983f95d9bf4bdfcedf9178d3a9b14c1bbc642764d671995de4b3123c73daaff490bd22e01cb8953f3f101b4c
-EBUILD bfgminer-2.5.0.ebuild 2772 SHA256 4ec69bad425bcfe06e9adf84f39219787566b9c85db43937653a7720bcd436ba SHA512 12095e60056bf4280e1fa9da97c0f58393c4a6ba7643aaf63ec66a58f77ad27ce3ddaa98cf994ab0e8dfd0b3384594b244c27dc868d0334c32b14438d77a3f73 WHIRLPOOL 3afa9607a3357338e34a08b881e471a1f9c1cf273ade22f93a72015ef72fb9ab5af08f8336e06a846f4f8ead4d750b43e1d33c92b8050dd7dd20c4a21bff378b
-EBUILD bfgminer-2.5.1.ebuild 3029 SHA256 48eed576274a820f67a3020ea2fe3d21ca5c1c06ed814522bbcdd761c2920467 SHA512 a0ff26be4e5dd251293a79562f40fcac166e6ae8372dba2264deccff70c0affadf2a872322c4cb57611cedfecb4134b12b091dc2124382bd80cda7200af82ae9 WHIRLPOOL 1364d3582d5b436b36bb4450aa644089e301f2b66311e2113d3f59bae0c5398727294264fd0ee3a49fdd230a8ead6173f3f0894604c74d6c5c7f2fb814b82b81
-MISC ChangeLog 2571 SHA256 98d1e1e4eb4e658ad0836a0b7f7cb18fb2168371d822575ab8d522f845a9c022 SHA512 53e5d346a76a2b2613f644080741ce142d830f906523d6d77797c38159998800ada1ce893b045ccd869107f3d936ae0ff240f6c08a24ddb6aa4a4b09a46bd415 WHIRLPOOL 09cf98f2853564c3239df0ed31f54feeaf4d3dc2317edf753d640a97e0e63ef2346e9df1377ab8d41b217878979ad30c309ad25d1964e106f070f8f60746a2c8
-MISC metadata.xml 1175 SHA256 fc9ed0f802ec29fdc2cb1130ab7ee10e20004c2bcb85ec90825f617a16489bd9 SHA512 77bf4302119fc923139600acf1c4edf2d0714e61d2fc7930cd5906aa54a441f54f6b33f90cce1c53129ba3ccd7163d7fb52248b1febe2c05adc0710299c5d1f7 WHIRLPOOL 8b630cccb14fe8e740d03b994a92a9293736128db864dbc1dd9b5649cf32d7b75dda826bde808f8df8a5bfb7462b2abfd8899d17d665b328e2edcc7f108ee6d6
+EBUILD bfgminer-2.5.3.ebuild 3008 SHA256 f24ecddfa4e2742ef4f3d8073b20dfa1df6657e20991d2419de774e30de6bf55 SHA512 8ea52f7808d92071bfcff8e1446bb3151370c0cb6af84fe18878b79f840a1b91f330f986bca226cc73dc5c72eeff5669dc1def58aecd6b4c125fcaa514443367 WHIRLPOOL 6d17e5687ba9302a2ebe96bc9336ebc2d20b6a49ae9423b11bafce1c5d04e276fe7987d8cc68ad1c920fdb5ad8c4b9606a0ed3ebf52f6ec64b4bddc13c33bf37
+EBUILD bfgminer-2.6.1.ebuild 3124 SHA256 fc7753f6199d845eb3935c70ff2bd7a7cce3d54b682fb53c9d3d40acf8f9e5e7 SHA512 39f14abfc7586b62898c68110d0100d5f339d8a1e8798aad0d2fe529d4e9f58610ac1833f1d1b4e3aa5278ef026c063c3bedbb5b8abe417bc25ffd6335d93d51 WHIRLPOOL fb11f60add2701bb8f8197c5e0df5eed696348a6239fd6784304bf5a07d5a03d4be81a05b73c80a61f408f9dc9e7efaf39bee14623085662cbba8c836fda0fa0
+MISC ChangeLog 2835 SHA256 df0c4167ac86a4d3c7815741ca0b806098627c9122d213697e96fc6c3a0eca43 SHA512 9c09ad545e5d122bf5670e84ad4aaadc1d73fdef81a703fd99feb9d9cfb2ac31c9f933576be830f481b2e3e1032005ad6f123a9cd00734582473b2917aada5e3 WHIRLPOOL 83b0308ecd5f44bacdda3c8c16e668dbcf7b3cc616e5b714c19fe4b46add7c4b995073c3f9f04e57b406c361bc9cb83e858df137fa71a51e0fe531bbec164988
+MISC metadata.xml 1247 SHA256 b2dfbbb502f7b309d61bbfa74420ba919f4874112fc5c5daab12bf2fd8c32d73 SHA512 eac9ed477ce67944c943db1ba0b24e89cec21c1935bb54a1a126536e56cc0f8814735e5c74a368e862cdc95e80b15676af068faffa2a4e659b80c784b041cfda WHIRLPOOL 81fd07dbca609d64b3576d31427bf8fcec55b4986d5d83b5722a0b4c076328955b6a496439d74c96872399b11818550d866df3905204179d3fe65251b5621b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAXOL4ACgkQl5yvQNBFVTXcIACfa9Tq/KPjGuJLk479ZCg3Q4DF
-tEwAnjsYdJPld0oNL7GTOP2a6GlZ6nhV
-=B76r
+iEYEAREIAAYFAlAXO60ACgkQl5yvQNBFVTW5xACgpduCBhgmcDZIDotqIDuJa2o8
+uNEAoJBFdgELuI0/sZ2p7qL+9l3C7icH
+=+33D
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bfgminer/bfgminer-2.5.1.ebuild b/net-misc/bfgminer/bfgminer-2.5.3.ebuild
index c5f1b7bf308a..05ae59ba2d9b 100644
--- a/net-misc/bfgminer/bfgminer-2.5.1.ebuild
+++ b/net-misc/bfgminer/bfgminer-2.5.3.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/net-misc/bfgminer/bfgminer-2.5.1.ebuild,v 1.1 2012/07/15 16:59:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.5.3.ebuild,v 1.1 2012/07/31 01:57:54 blueness Exp $
 
 EAPI=4
 
@@ -19,7 +19,6 @@ REQUIRED_USE='
 	|| ( bitforce cpumining icarus modminer opencl ztex )
 	adl? ( opencl )
 	altivec? ( cpumining ppc ppc64 )
-	opencl? ( ncurses )
 	padlock? ( cpumining || ( amd64 x86 ) )
 	sse2? ( cpumining || ( amd64 x86 ) )
 	sse4? ( cpumining amd64 )
diff --git a/net-misc/bfgminer/bfgminer-2.5.0.ebuild b/net-misc/bfgminer/bfgminer-2.6.1.ebuild
index 981563e7bd8d..95eabf02a0b1 100644
--- a/net-misc/bfgminer/bfgminer-2.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-2.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.5.0.ebuild,v 1.1 2012/07/06 18:31:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.6.1.ebuild,v 1.1 2012/07/31 01:57:54 blueness Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit eutils
 
@@ -14,18 +14,18 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
-IUSE="+adl altivec bitforce +cpumining examples hardened icarus modminer ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
-REQUIRED_USE="
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus modminer ncurses +opencl padlock scrypt sse2 sse2_4way sse4 +udev ztex"
+REQUIRED_USE='
 	|| ( bitforce cpumining icarus modminer opencl ztex )
 	adl? ( opencl )
 	altivec? ( cpumining ppc ppc64 )
-	opencl? ( ncurses )
 	padlock? ( cpumining || ( amd64 x86 ) )
+	scrypt? ( || ( cpumining opencl ) )
 	sse2? ( cpumining || ( amd64 x86 ) )
 	sse4? ( cpumining amd64 )
-"
+'
 
-DEPEND="
+DEPEND='
 	net-misc/curl
 	ncurses? (
 		sys-libs/ncurses
@@ -37,7 +37,7 @@ DEPEND="
 	ztex? (
 		virtual/libusb:1
 	)
-"
+'
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	virtual/pkgconfig
@@ -46,7 +46,18 @@ DEPEND="${DEPEND}
 		x11-libs/amd-adl-sdk
 	)
 	opencl? (
-		virtual/opencl
+		|| (
+			virtual/opencl
+			virtual/opencl-sdk
+			app-admin/eselect-opencl
+			dev-util/ati-stream-sdk
+			dev-util/ati-stream-sdk-bin
+			dev-util/amdstream
+			dev-util/amd-app-sdk
+			dev-util/amd-app-sdk-bin
+			dev-util/nvidia-cuda-sdk[opencl]
+			dev-util/intel-opencl-sdk
+		)
 	)
 	sse2? (
 		>=dev-lang/yasm-1.0.1
@@ -89,6 +100,7 @@ src_configure() {
 		$(use_enable modminer) \
 		$(use_with ncurses curses) \
 		$(use_enable opencl) \
+		$(use_enable scrypt) \
 		$(use_with udev libudev) \
 		$(use_enable ztex)
 	# sanitize directories
@@ -98,6 +110,9 @@ src_configure() {
 src_install() {
 	dobin bfgminer
 	dodoc AUTHORS NEWS README API-README
+	if use scrypt; then
+		dodoc SCRYPT-README
+	fi
 	if use icarus || use bitforce; then
 		dodoc FPGA-README
 	fi
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index c21f869419d1..b9f1e7d3934c 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name='modminer'>Enable support for mining with ModMiner FPGAs</flag>
 		<flag name='opencl'>Enable support for mining with OpenCL-capable devices (GPUs)</flag>
 		<flag name='padlock'>Enable support for mining with VIA Padlock CPUs</flag>
+		<flag name='scrypt'>Enable support for scrypt mining algorithm</flag>
 		<flag name='sse2_4way'>Enable support for CPU SSE2 4way mining algorithm</flag>
 		<flag name='sse4'>Enable support for CPU SSE4 mining algorithm</flag>
 		<flag name='ztex'>Enable support for mining with Ztex FPGAs</flag>