Minor code cleanup, switch to virtual/opencl

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 19 insertions, 37 deletions

diff --git a/net-misc/bfgminer/ChangeLog b/net-misc/bfgminer/ChangeLog
index ac60df5bb834..4ed030f674f4 100644
--- a/net-misc/bfgminer/ChangeLog
+++ b/net-misc/bfgminer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2012/08/06 15:57:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/ChangeLog,v 1.18 2012/08/06 16:02:58 blueness Exp $
+
+  06 Aug 2012; Anthony G. Basile <blueness@gentoo.org> bfgminer-2.5.3.ebuild,
+  bfgminer-2.6.1.ebuild:
+  Minor code cleanup, switch to virtual/opencl
 
 *bfgminer-2.6.3 (06 Aug 2012)
 
diff --git a/net-misc/bfgminer/bfgminer-2.5.3.ebuild b/net-misc/bfgminer/bfgminer-2.5.3.ebuild
index 05ae59ba2d9b..a46dbfd7a4a5 100644
--- a/net-misc/bfgminer/bfgminer-2.5.3.ebuild
+++ b/net-misc/bfgminer/bfgminer-2.5.3.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.3.ebuild,v 1.1 2012/07/31 01:57:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.5.3.ebuild,v 1.2 2012/08/06 16:02:58 blueness Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit eutils
 
@@ -15,16 +15,16 @@ 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='
+REQUIRED_USE="
 	|| ( bitforce cpumining icarus modminer opencl ztex )
 	adl? ( opencl )
 	altivec? ( cpumining ppc ppc64 )
 	padlock? ( cpumining || ( amd64 x86 ) )
 	sse2? ( cpumining || ( amd64 x86 ) )
 	sse4? ( cpumining amd64 )
-'
+"
 
-DEPEND='
+DEPEND="
 	net-misc/curl
 	ncurses? (
 		sys-libs/ncurses
@@ -36,7 +36,7 @@ DEPEND='
 	ztex? (
 		virtual/libusb:1
 	)
-'
+"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	virtual/pkgconfig
@@ -45,18 +45,7 @@ DEPEND="${DEPEND}
 		x11-libs/amd-adl-sdk
 	)
 	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
-		)
+		virtual/opencl
 	)
 	sse2? (
 		>=dev-lang/yasm-1.0.1
diff --git a/net-misc/bfgminer/bfgminer-2.6.1.ebuild b/net-misc/bfgminer/bfgminer-2.6.1.ebuild
index 95eabf02a0b1..ec8ded973433 100644
--- a/net-misc/bfgminer/bfgminer-2.6.1.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.6.1.ebuild,v 1.1 2012/07/31 01:57:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-2.6.1.ebuild,v 1.2 2012/08/06 16:02:58 blueness Exp $
 
-EAPI=4
+EAPI="4"
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
 IUSE="+adl altivec bitforce +cpumining examples hardened icarus modminer ncurses +opencl padlock scrypt sse2 sse2_4way sse4 +udev ztex"
-REQUIRED_USE='
+REQUIRED_USE="
 	|| ( bitforce cpumining icarus modminer opencl ztex )
 	adl? ( opencl )
 	altivec? ( cpumining ppc ppc64 )
@@ -23,9 +23,9 @@ REQUIRED_USE='
 	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,18 +46,7 @@ DEPEND="${DEPEND}
 		x11-libs/amd-adl-sdk
 	)
 	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
-		)
+		virtual/opencl
 	)
 	sse2? (
 		>=dev-lang/yasm-1.0.1