Version bumps, remove older unstable

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

7 files changed, 23 insertions, 362 deletions

diff --git a/net-misc/bfgminer/ChangeLog b/net-misc/bfgminer/ChangeLog
index c660f1010e0f..c5043fcfd1f7 100644
--- a/net-misc/bfgminer/ChangeLog
+++ b/net-misc/bfgminer/ChangeLog
@@ -1,6 +1,16 @@
 # 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.69 2014/08/17 12:06:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/ChangeLog,v 1.70 2014/09/16 00:39:28 blueness Exp $
+
+*bfgminer-4.7.1 (16 Sep 2014)
+*bfgminer-4.8.0 (16 Sep 2014)
+*bfgminer-3.10.7 (16 Sep 2014)
+
+  16 Sep 2014; Anthony G. Basile <blueness@gentoo.org> +bfgminer-3.10.7.ebuild,
+  +bfgminer-4.7.1.ebuild, +bfgminer-4.8.0.ebuild, -bfgminer-3.10.6.ebuild,
+  -bfgminer-4.4.0.ebuild, -bfgminer-4.5.0.ebuild, -bfgminer-4.6.0.ebuild,
+  -bfgminer-4.7.0.ebuild, metadata.xml:
+  Version bumps, remove older unstable
 
 *bfgminer-4.7.0 (17 Aug 2014)
 
diff --git a/net-misc/bfgminer/bfgminer-3.10.6.ebuild b/net-misc/bfgminer/bfgminer-3.10.7.ebuild
index 15b995e12211..49530adc2cdb 100644
--- a/net-misc/bfgminer/bfgminer-3.10.6.ebuild
+++ b/net-misc/bfgminer/bfgminer-3.10.7.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2014/07/27 12:12:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-3.10.7.ebuild,v 1.1 2014/09/16 00:39:28 blueness Exp $
 
 EAPI=5
 
@@ -45,7 +45,7 @@ DEPEND='
 		sys-libs/ncurses[unicode?]
 	)
 	>=dev-libs/jansson-2
-	net-libs/libblkmaker
+	net-libs/libblkmaker:=
 	udev? (
 		virtual/udev
 	)
diff --git a/net-misc/bfgminer/bfgminer-4.4.0.ebuild b/net-misc/bfgminer/bfgminer-4.4.0.ebuild
deleted file mode 100644
index dd0b4b30090d..000000000000
--- a/net-misc/bfgminer/bfgminer-4.4.0.ebuild
+++ /dev/null
@@ -1,176 +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-4.4.0.ebuild,v 1.2 2014/07/22 15:28:06 blueness Exp $
-
-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}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="adl antminer avalon bfx bifury bitforce bfsb bigpic bitfury cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev unicode x6500 zeusminer 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 )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	nanofury? ( bitfury )
-	scrypt? ( || ( cpumining dualminer gridseed opencl zeusminer ) )
-	twinfury? ( bitfury )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	x6500? ( libusb )
-	zeusminer? ( scrypt )
-	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
-	)
-	screen? (
-		app-misc/screen
-		|| (
-			>=sys-apps/coreutils-8.15
-			sys-freebsd/freebsd-bin
-			app-misc/realpath
-		)
-	)
-'
-RDEPEND="${DEPEND}
-	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}
-	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 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 hashbusterusb) \
-		$(use_enable hashfast) \
-		$(use_enable icarus) \
-		$(use_enable jingtian) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable rockminer) \
-		$(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 zeusminer) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-	if ! use screen; then
-		rm "${D}/usr/bin/start-bfgminer.sh"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-4.5.0.ebuild b/net-misc/bfgminer/bfgminer-4.5.0.ebuild
deleted file mode 100644
index f8e45433a57f..000000000000
--- a/net-misc/bfgminer/bfgminer-4.5.0.ebuild
+++ /dev/null
@@ -1,177 +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-4.5.0.ebuild,v 1.1 2014/07/27 12:12:59 blueness Exp $
-
-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}.txz -> ${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-
-# TODO: knc (needs i2c-tools header)
-IUSE="adl antminer avalon bfx bifury bitforce bfsb bigpic bitfury cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer 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 )
-	littlefury? ( bitfury )
-	lm_sensors? ( opencl )
-	metabank? ( bitfury )
-	nanofury? ( bitfury )
-	scrypt? ( || ( cpumining dualminer gridseed opencl zeusminer ) )
-	twinfury? ( bitfury )
-	unicode? ( ncurses )
-	proxy? ( || ( proxy_getwork proxy_stratum ) )
-	proxy_getwork? ( proxy )
-	proxy_stratum? ( proxy )
-	x6500? ( libusb )
-	zeusminer? ( scrypt )
-	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
-	)
-	screen? (
-		app-misc/screen
-		|| (
-			>=sys-apps/coreutils-8.15
-			sys-freebsd/freebsd-bin
-			app-misc/realpath
-		)
-	)
-'
-RDEPEND="${DEPEND}
-	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}
-	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 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 hashbusterusb) \
-		$(use_enable hashfast) \
-		$(use_enable icarus) \
-		$(use_enable jingtian) \
-		$(use_enable klondike) \
-		$(use_enable littlefury) \
-		$(use_enable metabank) \
-		$(use_enable modminer) \
-		$(use_enable nanofury) \
-		$(use_enable opencl) \
-		$(use_enable rockminer) \
-		$(use_enable scrypt) \
-		$(use_enable twinfury) \
-		--with-system-libblkmaker \
-		$with_curses \
-		$(use_with udev libudev) \
-		$(use_enable udev-broad-rules broad-udevrules) \
-		$(use_with lm_sensors sensors) \
-		$(use_with proxy_getwork libmicrohttpd) \
-		$(use_with proxy_stratum libevent) \
-		$(use_enable x6500) \
-		$(use_enable zeusminer) \
-		$(use_enable ztex)
-}
-
-src_install() {
-	emake install DESTDIR="$D"
-	if ! use examples; then
-		rm -r "${D}/usr/share/doc/${PF}/rpc-examples"
-	fi
-	if ! use screen; then
-		rm "${D}/usr/bin/start-bfgminer.sh"
-	fi
-}
diff --git a/net-misc/bfgminer/bfgminer-4.7.0.ebuild b/net-misc/bfgminer/bfgminer-4.7.1.ebuild
index d2d5a8b6336e..9bbd38e88f68 100644
--- a/net-misc/bfgminer/bfgminer-4.7.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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-4.7.0.ebuild,v 1.1 2014/08/17 12:06:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-4.7.1.ebuild,v 1.1 2014/09/16 00:39:28 blueness Exp $
 
 EAPI=5
 
@@ -50,7 +50,7 @@ DEPEND='
 		sys-libs/ncurses[unicode?]
 	)
 	>=dev-libs/jansson-2
-	net-libs/libblkmaker
+	net-libs/libblkmaker:=
 	udev? (
 		virtual/udev
 	)
diff --git a/net-misc/bfgminer/bfgminer-4.6.0.ebuild b/net-misc/bfgminer/bfgminer-4.8.0.ebuild
index df66f8f75fdc..b5c25c4e68f0 100644
--- a/net-misc/bfgminer/bfgminer-4.6.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-4.8.0.ebuild
@@ -1,6 +1,6 @@
 # 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-4.6.0.ebuild,v 1.1 2014/08/03 21:28:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bfgminer/bfgminer-4.8.0.ebuild,v 1.1 2014/09/16 00:39:28 blueness Exp $
 
 EAPI=5
 
@@ -15,9 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 
 # TODO: knc (needs i2c-tools header)
-IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
+# TODO: minergate (needs actual miner_gate)
+IUSE="adl antminer avalon avalonmm bfx bifury bitforce bfsb bigpic bitfury cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster hashbuster2 hashfast icarus jingtian klondike +libusb littlefury lm_sensors metabank modminer nanofury ncurses opencl proxy proxy_getwork proxy_stratum rockminer screen scrypt twinfury +udev udev-broad-rules unicode x6500 zeusminer ztex"
 REQUIRED_USE='
-	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
+	|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury x6500 zeusminer ztex )
 	adl? ( opencl )
 	bfsb? ( bitfury )
 	bfx? ( bitfury libusb )
@@ -49,7 +50,8 @@ DEPEND='
 		sys-libs/ncurses[unicode?]
 	)
 	>=dev-libs/jansson-2
-	net-libs/libblkmaker
+	dev-libs/libbase58
+	net-libs/libblkmaker:=
 	udev? (
 		virtual/udev
 	)
@@ -137,6 +139,7 @@ src_configure() {
 		$(use_enable bfx) \
 		$(use_enable bigpic) \
 		$(use_enable bitfury) \
+		$(use_enable cointerra) \
 		$(use_enable cpumining) \
 		$(use_enable drillbit) \
 		$(use_enable dualminer) \
diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 1535b8be362f..abb7b6d22741 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -20,6 +20,7 @@
 		<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='cointerra'>Enable support for mining with CoinTerra TerraMiner.</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>