Version bumps and remove unstables

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

13 files changed, 88 insertions, 1064 deletions

diff --git a/net-misc/bfgminer/ChangeLog b/net-misc/bfgminer/ChangeLog
index 47d2a659cd0d..42bf56c7a2f7 100644
--- a/net-misc/bfgminer/ChangeLog
+++ b/net-misc/bfgminer/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/bfgminer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/ChangeLog,v 1.55 2014/01/26 11:45:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/ChangeLog,v 1.56 2014/05/26 23:07:36 blueness Exp $
+
+*bfgminer-3.10.1 (26 May 2014)
+*bfgminer-3.5.8 (26 May 2014)
+*bfgminer-4.0.0 (26 May 2014)
+
+  26 May 2014; Anthony G. Basile <blueness@gentoo.org> +bfgminer-3.10.1.ebuild,
+  +bfgminer-3.5.8.ebuild, +bfgminer-4.0.0.ebuild, -bfgminer-3.10.0.ebuild,
+  -bfgminer-3.2.7.ebuild, -bfgminer-3.2.8.ebuild, -bfgminer-3.2.9.ebuild,
+  -bfgminer-3.3.0-r2.ebuild, -bfgminer-3.5.4.ebuild, -bfgminer-3.5.5.ebuild,
+  -bfgminer-3.5.7.ebuild, -bfgminer-3.8.0.ebuild, -bfgminer-3.8.1.ebuild,
+  -bfgminer-3.9.0.ebuild, metadata.xml:
+  Version bumps and remove unstables
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> bfgminer-3.5.6.ebuild:
   Stable for x86, wrt bug #489300
diff --git a/net-misc/bfgminer/bfgminer-3.10.0.ebuild b/net-misc/bfgminer/bfgminer-3.10.1.ebuild
index 8d864ba94ba9..5c3fc92c761e 100644
--- a/net-misc/bfgminer/bfgminer-3.10.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.10.0.ebuild,v 1.1 2014/01/18 14:05:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.10.1.ebuild,v 1.1 2014/05/26 23:07:36 blueness Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils
 
@@ -12,15 +12,12 @@ SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 
 # TODO: knc (needs i2c-tools header)
 IUSE="+adl antminer avalon bifury bitforce bfsb bigpic bitfury cpumining drillbit examples hardened hashbuster hashbuster2 hashfast icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt twinfury +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
+REQUIRED_USE='
+	|| ( antminer avalon bfsb bifury bigpic bitforce bitfury cpumining drillbit hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 ztex )
 	adl? ( opencl )
 	bfsb? ( bitfury )
 	bigpic? ( bitfury )
@@ -40,9 +37,9 @@ REQUIRED_USE="
 	proxy_stratum? ( proxy )
 	x6500? ( libusb )
 	ztex? ( libusb )
-"
+'
 
-DEPEND="
+DEPEND='
 	net-misc/curl
 	ncurses? (
 		sys-libs/ncurses[unicode?]
@@ -70,10 +67,20 @@ DEPEND="
 	proxy_stratum? (
 		dev-libs/libevent
 	)
-"
+'
 RDEPEND="${DEPEND}
 	opencl? (
-		virtual/opencl
+		|| (
+			virtual/opencl
+			virtual/opencl-sdk
+			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
+		)
 	)
 "
 DEPEND="${DEPEND}
@@ -119,7 +126,7 @@ src_configure() {
 		$(use_enable cpumining) \
 		$(use_enable drillbit) \
 		$(use_enable hashbuster) \
-		$(use_enable hashbuster2) \
+		$(use_enable hashbuster2 hashbusterusb) \
 		$(use_enable hashfast) \
 		$(use_enable icarus) \
 		$(use_enable klondike) \
diff --git a/net-misc/bfgminer/bfgminer-3.2.7.ebuild b/net-misc/bfgminer/bfgminer-3.2.7.ebuild
deleted file mode 100644
index c964854d35dc..000000000000
--- a/net-misc/bfgminer/bfgminer-3.2.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.2.7.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-IUSE="+adl avalon bitforce cpumining examples hardened icarus lm_sensors modminer ncurses +opencl proxy scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	lm_sensors? ( opencl )
-	scrypt? ( || ( cpumining opencl ) )
-	unicode? ( ncurses )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	proxy? (
-		net-libs/libmicrohttpd
-	)
-	x6500? (
-		virtual/libusb:1
-	)
-	ztex? (
-		virtual/libusb:1
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.2
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bitforce) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_enable modminer) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy libmicrohttpd) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.2.8.ebuild b/net-misc/bfgminer/bfgminer-3.2.8.ebuild
deleted file mode 100644
index 8cd75ff5a88a..000000000000
--- a/net-misc/bfgminer/bfgminer-3.2.8.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.2.8.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-IUSE="+adl avalon bitforce cpumining examples hardened icarus lm_sensors modminer ncurses +opencl proxy scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	lm_sensors? ( opencl )
-	scrypt? ( || ( cpumining opencl ) )
-	unicode? ( ncurses )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	proxy? (
-		net-libs/libmicrohttpd
-	)
-	x6500? (
-		virtual/libusb:1
-	)
-	ztex? (
-		virtual/libusb:1
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.2
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bitforce) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_enable modminer) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy libmicrohttpd) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.2.9.ebuild b/net-misc/bfgminer/bfgminer-3.2.9.ebuild
deleted file mode 100644
index 71ffe434d8bc..000000000000
--- a/net-misc/bfgminer/bfgminer-3.2.9.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.2.9.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-IUSE="+adl avalon bitforce cpumining examples hardened icarus lm_sensors modminer ncurses +opencl proxy scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	lm_sensors? ( opencl )
-	scrypt? ( || ( cpumining opencl ) )
-	unicode? ( ncurses )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	proxy? (
-		net-libs/libmicrohttpd
-	)
-	x6500? (
-		virtual/libusb:1
-	)
-	ztex? (
-		virtual/libusb:1
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.2
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bitforce) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_enable modminer) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy libmicrohttpd) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.3.0-r2.ebuild b/net-misc/bfgminer/bfgminer-3.3.0-r2.ebuild
deleted file mode 100644
index 7f045f03caec..000000000000
--- a/net-misc/bfgminer/bfgminer-3.3.0-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.3.0-r2.ebuild,v 1.1 2013/11/07 17:49:02 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-IUSE="+adl avalon bitforce bfsb bigpic bitfury cpumining examples hardened icarus littlefury lm_sensors metabank modminer ncurses +opencl proxy proxy_getwork proxy_stratum scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	bfsb? ( bitfury )
-	bigpic? ( bitfury )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	scrypt? ( || ( cpumining opencl ) )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-	x6500? (
-		virtual/libusb:1
-	)
-	ztex? (
-		virtual/libusb:1
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.2
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bitforce) \
-		$(use_enable bfsb) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.5.4.ebuild b/net-misc/bfgminer/bfgminer-3.5.4.ebuild
deleted file mode 100644
index 334f5d7b6dbe..000000000000
--- a/net-misc/bfgminer/bfgminer-3.5.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.5.4.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="+adl avalon bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster icarus littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	bfsb? ( bitfury )
-	bigpic? ( bitfury )
-	hashbuster? ( bitfury )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	nanofury? ( bitfury )
-	scrypt? ( || ( cpumining opencl ) )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-	x6500? (
-		virtual/libusb:1
-	)
-	ztex? (
-		virtual/libusb:1
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.2
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bitforce) \
-		$(use_enable bfsb) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cpumining) \
-		$(use_enable hashbuster) \
-		$(use_enable icarus) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.5.5.ebuild b/net-misc/bfgminer/bfgminer-3.5.5.ebuild
deleted file mode 100644
index 14cf0dbe9d23..000000000000
--- a/net-misc/bfgminer/bfgminer-3.5.5.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.5.5.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="+adl avalon bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster icarus littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	bfsb? ( bitfury )
-	bigpic? ( bitfury )
-	hashbuster? ( bitfury )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	nanofury? ( bitfury )
-	scrypt? ( || ( cpumining opencl ) )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-	x6500? (
-		virtual/libusb:1
-	)
-	ztex? (
-		virtual/libusb:1
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.2
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bitforce) \
-		$(use_enable bfsb) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cpumining) \
-		$(use_enable hashbuster) \
-		$(use_enable icarus) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.5.7.ebuild b/net-misc/bfgminer/bfgminer-3.5.8.ebuild
index ddafcb1b4eef..f9148170cc44 100644
--- a/net-misc/bfgminer/bfgminer-3.5.7.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.5.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.5.7.ebuild,v 1.1 2014/01/18 14:05:06 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.5.8.ebuild,v 1.1 2014/05/26 23:07:36 blueness Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils
 
@@ -12,15 +12,12 @@ SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 
 # TODO: knc (needs i2c-tools header)
 IUSE="+adl avalon bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster icarus littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
+REQUIRED_USE='
+	|| ( avalon bfsb bigpic bitforce bitfury cpumining hashbuster icarus littlefury metabank modminer nanofury opencl proxy x6500 ztex )
 	adl? ( opencl )
 	bfsb? ( bitfury )
 	bigpic? ( bitfury )
@@ -34,9 +31,9 @@ REQUIRED_USE="
 	proxy? ( || ( proxy_getwork proxy_stratum ) )
 	proxy_getwork? ( proxy )
 	proxy_stratum? ( proxy )
-"
+'
 
-DEPEND="
+DEPEND='
 	net-misc/curl
 	ncurses? (
 		sys-libs/ncurses[unicode?]
@@ -67,10 +64,20 @@ DEPEND="
 	ztex? (
 		virtual/libusb:1
 	)
-"
+'
 RDEPEND="${DEPEND}
 	opencl? (
-		virtual/opencl
+		|| (
+			virtual/opencl
+			virtual/opencl-sdk
+			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
+		)
 	)
 "
 DEPEND="${DEPEND}
diff --git a/net-misc/bfgminer/bfgminer-3.8.1.ebuild b/net-misc/bfgminer/bfgminer-3.8.1.ebuild
deleted file mode 100644
index 7bbefe09bec4..000000000000
--- a/net-misc/bfgminer/bfgminer-3.8.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.8.1.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="+adl avalon bifury bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster hashbuster2 icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt twinfury +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	bfsb? ( bitfury )
-	bigpic? ( bitfury )
-	hashbuster? ( bitfury )
-	hashbuster2? ( bitfury libusb )
-	klondike? ( libusb )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	nanofury? ( bitfury )
-	scrypt? ( || ( cpumining opencl ) )
-	twinfury? ( bitfury )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	x6500? ( libusb )
-	ztex? ( libusb )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.7
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bifury) \
-		$(use_enable bitforce) \
-		$(use_enable bfsb) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cpumining) \
-		$(use_enable hashbuster) \
-		$(use_enable hashbuster2) \
-		$(use_enable icarus) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		$(use_enable twinfury) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.9.0.ebuild b/net-misc/bfgminer/bfgminer-3.9.0.ebuild
deleted file mode 100644
index d33d9fcc9797..000000000000
--- a/net-misc/bfgminer/bfgminer-3.9.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.9.0.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="+adl avalon bifury bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster hashbuster2 icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt twinfury +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
-	adl? ( opencl )
-	bfsb? ( bitfury )
-	bigpic? ( bitfury )
-	hashbuster? ( bitfury )
-	hashbuster2? ( bitfury libusb )
-	klondike? ( libusb )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	nanofury? ( bitfury )
-	scrypt? ( || ( cpumining opencl ) )
-	twinfury? ( bitfury )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	x6500? ( libusb )
-	ztex? ( libusb )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses[unicode?]
-	)
-	>=dev-libs/jansson-2
-	net-libs/libblkmaker
-	udev? (
-		virtual/udev
-	)
-	hashbuster? (
-		dev-libs/hidapi
-	)
-	libusb? (
-		virtual/libusb:1
-	)
-	lm_sensors? (
-		sys-apps/lm_sensors
-	)
-	nanofury? (
-		dev-libs/hidapi
-	)
-	proxy_getwork? (
-		net-libs/libmicrohttpd
-	)
-	proxy_stratum? (
-		dev-libs/libevent
-	)
-"
-RDEPEND="${DEPEND}
-	opencl? (
-		virtual/opencl
-	)
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	>=dev-libs/uthash-1.9.7
-	sys-apps/sed
-	cpumining? (
-		amd64? (
-			>=dev-lang/yasm-1.0.1
-		)
-		x86? (
-			>=dev-lang/yasm-1.0.1
-		)
-	)
-"
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	local with_curses
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	if use ncurses; then
-		if use unicode; then
-			with_curses='--with-curses=ncursesw'
-		else
-			with_curses='--with-curses=ncurses'
-		fi
-	else
-		with_curses='--without-curses'
-	fi
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable adl) \
-		$(use_enable avalon) \
-		$(use_enable bifury) \
-		$(use_enable bitforce) \
-		$(use_enable bfsb) \
-		$(use_enable bigpic) \
-		$(use_enable bitfury) \
-		$(use_enable cpumining) \
-		$(use_enable hashbuster) \
-		$(use_enable hashbuster2) \
-		$(use_enable icarus) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable scrypt) \
-		$(use_enable twinfury) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-3.8.0.ebuild b/net-misc/bfgminer/bfgminer-4.0.0.ebuild
index 5194d655aa4e..40d54a20fd09 100644
--- a/net-misc/bfgminer/bfgminer-3.8.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.0.0.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.8.0.ebuild,v 1.1 2014/01/01 23:46:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-4.0.0.ebuild,v 1.1 2014/05/26 23:07:36 blueness Exp $
 
-EAPI="4"
+EAPI=5
 
 inherit eutils
 
 DESCRIPTION="Modular Bitcoin ASIC/FPGA/GPU/CPU miner in C"
 HOMEPAGE="https://bitcointalk.org/?topic=168174"
-SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.tbz2"
+SRC_URI="http://luke.dashjr.org/programs/bitcoin/files/${PN}/${PV}/${P}.txz -> ${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# Waiting for dev-libs/hidapi to be keyworded
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 
 # TODO: knc (needs i2c-tools header)
-IUSE="+adl avalon bifury bitforce bfsb bigpic bitfury cpumining examples hardened hashbuster hashbuster2 icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt twinfury +udev unicode x6500 ztex"
-REQUIRED_USE="
-	|| ( avalon bitforce cpumining icarus modminer opencl proxy x6500 ztex )
+IUSE="+adl antminer avalon bfx bifury bitforce bfsb bigpic bitfury cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses +opencl proxy proxy_getwork proxy_stratum scrypt twinfury +udev unicode x6500 ztex"
+REQUIRED_USE='
+	|| ( antminer avalon bfsb bfx bifury bigpic bitforce bitfury cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 ztex )
 	adl? ( opencl )
 	bfsb? ( bitfury )
+	bfx? ( bitfury libusb )
 	bigpic? ( bitfury )
+	drillbit? ( bitfury )
+	dualminer? ( icarus )
+	gridseed? ( scrypt )
 	hashbuster? ( bitfury )
 	hashbuster2? ( bitfury libusb )
 	klondike? ( libusb )
@@ -39,9 +40,9 @@ REQUIRED_USE="
 	proxy_stratum? ( proxy )
 	x6500? ( libusb )
 	ztex? ( libusb )
-"
+'
 
-DEPEND="
+DEPEND='
 	net-misc/curl
 	ncurses? (
 		sys-libs/ncurses[unicode?]
@@ -69,10 +70,20 @@ DEPEND="
 	proxy_stratum? (
 		dev-libs/libevent
 	)
-"
+'
 RDEPEND="${DEPEND}
 	opencl? (
-		virtual/opencl
+		|| (
+			virtual/opencl
+			virtual/opencl-sdk
+			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
+		)
 	)
 "
 DEPEND="${DEPEND}
@@ -108,15 +119,21 @@ src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		$(use_enable adl) \
+		$(use_enable antminer) \
 		$(use_enable avalon) \
 		$(use_enable bifury) \
 		$(use_enable bitforce) \
 		$(use_enable bfsb) \
+		$(use_enable bfx) \
 		$(use_enable bigpic) \
 		$(use_enable bitfury) \
 		$(use_enable cpumining) \
+		$(use_enable drillbit) \
+		$(use_enable dualminer) \
+		$(use_enable gridseed) \
 		$(use_enable hashbuster) \
-		$(use_enable hashbuster2) \
+		$(use_enable hashbuster2 hashbusterusb) \
+		$(use_enable hashfast) \
 		$(use_enable icarus) \
 		$(use_enable klondike) \
 		$(use_enable littlefury) \
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 4159c3e21138..d06de95acda6 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<maintainer>
-		<email>luke-jr+gentoobugs@utopios.org</email>
+		<email>luke_gentoo_bitcoin@dashjr.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
@@ -17,10 +16,13 @@
 		<flag name='bifury'>Enable support for mining with Bi*fury USB sticks</flag>
 		<flag name='bitforce'>Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs</flag>
 		<flag name='bfsb'>Enable support for mining on BFSB host Raspberry Pi</flag>
+		<flag name='bfx'>Enable support for mining with BFx2 USB sticks</flag>
 		<flag name='bigpic'>Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)</flag>
 		<flag name='bitfury'>Enable support for mining with 55nm Bitfury-based devices</flag>
 		<flag name='cpumining'>Enable support for mining with CPUs</flag>
 		<flag name='drillbit'>Enable support for mining with Drillbit boards</flag>
+		<flag name='dualminer'>Enable support for mining with DualMiner USB sticks</flag>
+		<flag name='gridseed'>Enable support for mining with 5-chip GridSeed orbs</flag>
 		<flag name='hashbuster'>Enable support for mining with HashBuster nano boards</flag>
 		<flag name='hashbuster2'>Enable support for mining with HashBuster micro boards</flag>
 		<flag name='hashfast'>Enable support for mining with HashFast devices</flag>