Version bump

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

4 files changed, 92 insertions, 4 deletions

diff --git a/net-misc/cgminer/ChangeLog b/net-misc/cgminer/ChangeLog
index 469c44c51c91..50a882e78ebf 100644
--- a/net-misc/cgminer/ChangeLog
+++ b/net-misc/cgminer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cgminer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/ChangeLog,v 1.42 2013/10/01 16:48:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/ChangeLog,v 1.43 2013/10/15 20:41:10 blueness Exp $
+
+*cgminer-3.6.1 (15 Oct 2013)
+
+  15 Oct 2013; Anthony G. Basile <blueness@gentoo.org> +cgminer-3.6.1.ebuild,
+  cgminer-3.5.0.ebuild, metadata.xml:
+  Version bump
 
 *cgminer-3.5.0 (01 Oct 2013)
 
diff --git a/net-misc/cgminer/cgminer-3.5.0.ebuild b/net-misc/cgminer/cgminer-3.5.0.ebuild
index 54641c28216d..11b872206112 100644
--- a/net-misc/cgminer/cgminer-3.5.0.ebuild
+++ b/net-misc/cgminer/cgminer-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-3.5.0.ebuild,v 1.1 2013/10/01 16:48:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-3.5.0.ebuild,v 1.2 2013/10/15 20:41:10 blueness Exp $
 
 EAPI=5
 
@@ -8,8 +8,8 @@ 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="https://github.com/ckolivas/cgminer/archive/v${PV}.tar.gz"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
+SRC_URI="https://github.com/ckolivas/cgminer/archive/v${PV}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/cgminer/cgminer-3.6.1.ebuild b/net-misc/cgminer/cgminer-3.6.1.ebuild
new file mode 100644
index 000000000000..d10298c13374
--- /dev/null
+++ b/net-misc/cgminer/cgminer-3.6.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-3.6.1.ebuild,v 1.1 2013/10/15 20:41:10 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="https://github.com/ckolivas/cgminer/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples hardened ncurses opencl adl scrypt
+	avalon bflsc bitforce icarus klondike modminer"
+
+REQUIRED_USE="|| ( opencl avalon bflsc bitforce icarus klondike modminer )
+	adl? ( opencl )
+	scrypt? ( opencl )"
+
+DEPEND="net-misc/curl
+	dev-libs/jansson
+	adl? ( x11-libs/amd-adl-sdk )
+	ncurses? ( sys-libs/ncurses )
+	opencl? ( virtual/opencl )
+	avalon? ( virtual/libusb:1 )
+	bflsc? ( virtual/libusb:1 )
+	bitforce? ( virtual/libusb:1 )
+	icarus? ( virtual/libusb:1 )
+	modminer? ( virtual/libusb:1 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ln -s /usr/include/ADL/* ADL_SDK/
+	eautoreconf
+}
+
+src_configure() {
+	use hardened && append-cflags "-nopie"
+
+	econf $(use_with ncurses curses) \
+		$(use_enable opencl) \
+		$(use_enable adl) \
+		$(use_enable scrypt) \
+		$(use_enable avalon) \
+		$(use_enable bflsc) \
+		$(use_enable bitforce) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(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
+	if use doc; then
+		dodoc AUTHORS NEWS README API-README
+		use opencl && dodoc GPU-README
+		use scrypt && dodoc SCRYPT-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 opencl; then
+		insinto /usr/lib/cgminer
+		doins *.cl
+	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 101999cbb896..491aeb225499 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="bflsc">Enable support for BFL ASICs</flag>
 		<flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE FPGAs</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="modminer">Enable support for mining with ModMiner FPGAs</flag>
 		<flag name="opencl">Enable support for mining with OpenCL-capable devices (GPUs)</flag>
 		<flag name="scrypt">Enable support for scrypt mining algorithm</flag>