Punt older 2.5.x, version bump 2.5.3 and 2.6.1

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 34 insertions, 12 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/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>