Version bump to 4.x branch

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

4 files changed, 101 insertions, 4 deletions

diff --git a/net-misc/cgminer/ChangeLog b/net-misc/cgminer/ChangeLog
index 04c40b660050..cadf868f2048 100644
--- a/net-misc/cgminer/ChangeLog
+++ b/net-misc/cgminer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cgminer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/ChangeLog,v 1.61 2014/02/08 23:07:52 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/ChangeLog,v 1.62 2014/02/24 00:21:41 blueness Exp $
+
+*cgminer-4.0.0 (24 Feb 2014)
+
+  24 Feb 2014; Anthony G. Basile <blueness@gentoo.org> +cgminer-4.0.0.ebuild,
+  cgminer-3.9.0.1.ebuild, metadata.xml:
+  Version bump to 4.x branch
 
 *cgminer-3.12.3 (08 Feb 2014)
 
diff --git a/net-misc/cgminer/cgminer-3.9.0.1.ebuild b/net-misc/cgminer/cgminer-3.9.0.1.ebuild
index 7402cc228e6a..2092f971ab8f 100644
--- a/net-misc/cgminer/cgminer-3.9.0.1.ebuild
+++ b/net-misc/cgminer/cgminer-3.9.0.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/cgminer/cgminer-3.9.0.1.ebuild,v 1.2 2014/01/26 16:16:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-3.9.0.1.ebuild,v 1.3 2014/02/24 00:21:41 blueness Exp $
 
 EAPI=5
 
@@ -13,8 +13,8 @@ S=${WORKDIR}/${PN}-3.9.0
 
 DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
 HOMEPAGE="http://bitcointalk.org/?topic=28402.msg357369 http://github.com/ckolivas/cgminer"
-#SRC_URI="http://ck.kolivas.org/apps/cgminer/${PN}-${MY_PV}.tar.bz2"
-SRC_URI="http://ck.kolivas.org/apps/cgminer/3.9/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="http://ck.kolivas.org/apps/cgminer/${PN}-${MY_PV}.tar.bz2"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/3.9/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/cgminer/cgminer-4.0.0.ebuild b/net-misc/cgminer/cgminer-4.0.0.ebuild
new file mode 100644
index 000000000000..0781818715d6
--- /dev/null
+++ b/net-misc/cgminer/cgminer-4.0.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-4.0.0.ebuild,v 1.1 2014/02/24 00:21:41 blueness Exp $
+
+EAPI=5
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
+HOMEPAGE="http://bitcointalk.org/?topic=28402.msg357369 http://github.com/ckolivas/cgminer"
+SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/3.9/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+HARDWARE="avalon avalon2 bab bitmine_A1 bflsc bitforce bitfury cointerra drillbit hashfast icarus klondike knc minion modminer"
+IUSE="doc examples udev hardened ncurses ${HARDWARE}"
+
+REQUIRED_USE="|| ( ${HARDWARE} )"
+
+RDEPEND="net-misc/curl
+	dev-libs/jansson
+	ncurses? ( sys-libs/ncurses )
+	avalon? ( virtual/libusb:1 )
+	bflsc? ( virtual/libusb:1 )
+	bitforce? ( virtual/libusb:1 )
+	bitfury? ( virtual/libusb:1 )
+	cointerra? ( virtual/libusb:1 )
+	drillbit? ( virtual/libusb:1 )
+	hashfast? ( virtual/libusb:1 )
+	icarus? ( virtual/libusb:1 )
+	klondike? ( virtual/libusb:1 )
+	modminer? ( virtual/libusb:1 )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	use hardened && append-cflags "-nopie"
+
+	econf $(use_with ncurses curses) \
+		$(use_enable avalon) \
+		$(use_enable avalon2) \
+		$(use_enable bab) \
+		$(use_enable bitmine_A1) \
+		$(use_enable bflsc) \
+		$(use_enable bitforce) \
+		$(use_enable bitfury) \
+		$(use_enable cointerra) \
+		$(use_enable drillbit) \
+		$(use_enable hashfast) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(use_enable knc) \
+		$(use_enable minion) \
+		$(use_enable modminer)
+	# sanitize directories (is this still needed?)
+	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
+}
+
+src_install() { # How about using some make install?
+	dobin cgminer
+	insinto /lib/udev/rules.d
+	use udev && doins 01-cgminer.rules
+	if use doc; then
+		dodoc AUTHORS NEWS README API-README
+		use icarus || use bitforce || use modminer && dodoc FPGA-README
+		use avalon || use bflsc && dodoc ASIC-README
+	fi
+
+	if use modminer; then
+		insinto /usr/lib/cgminer/modminer
+		doins bitstreams/*.ncd
+		dodoc bitstreams/COPYING_fpgaminer
+	fi
+	if use examples; then
+		docinto examples
+		dodoc api-example.php miner.php API.java api-example.c example.conf
+	fi
+}
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index f247ec2f5179..8c295a40235b 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -13,12 +13,18 @@
 	<use>
 		<flag name="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag>
 		<flag name="avalon">Enable support for Avalon ASICs</flag>
+		<flag name="avalon2">Enable support for Avalon2 ASICs</flag>
+		<flag name="bab">Enable support for BlackArrow Bitfury</flag>
 		<flag name="bflsc">Enable support for BFL ASICs</flag>
 		<flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE FPGAs</flag>
 		<flag name="bitfury">Enable support for mining with BitFury ASICs</flag>
+		<flag name="bitmine_A1">Enable support for mining with Bitmine.ch A1 ASICs</flag>
+		<flag name="cointerra">Enable support for mining with Cointerra ASICs</flag>
 		<flag name="drillbit">Enable support for mining with Drillbit BitFury ASICs</flag>
+		<flag name="hashfast">Enable support for mining with Hashfast</flag>
 		<flag name="icarus">Enable support for mining with Icarus FPGAs</flag>
 		<flag name="klondike">Enable support for mining with Klondik ASICs</flag>
+		<flag name="knc">Enable support for mining with KnC miners</flag>
 		<flag name="minion">Enable support for mining with BlackArrow Bitfury </flag>
 		<flag name="modminer">Enable support for mining with ModMiner FPGAs</flag>
 		<flag name="opencl">Enable support for mining with OpenCL-capable devices (GPUs)</flag>