Version bump, remove older unstable

(Portage version: 2.1.10.49/cvs/Linux x86_64)

6 files changed, 30 insertions, 308 deletions

diff --git a/net-misc/cgminer/ChangeLog b/net-misc/cgminer/ChangeLog
index f95d96952329..cf4dc0ed55c5 100644
--- a/net-misc/cgminer/ChangeLog
+++ b/net-misc/cgminer/ChangeLog
@@ -1,5 +1,12 @@
 
 
+*cgminer-2.3.4 (27 Apr 2012)
+
+  27 Apr 2012; Anthony G. Basile <blueness@gentoo.org> -cgminer-2.3.0.ebuild,
+  -cgminer-2.3.1.2.ebuild, -cgminer-2.3.2.ebuild, -cgminer-2.3.3.ebuild,
+  +cgminer-2.3.4.ebuild, metadata.xml:
+  Version bump, remove older unstable
+
 *cgminer-2.3.3 (15 Apr 2012)
 
   15 Apr 2012; Anthony G. Basile <blueness@gentoo.org> +cgminer-2.3.3.ebuild:
diff --git a/net-misc/cgminer/cgminer-2.3.0.ebuild b/net-misc/cgminer/cgminer-2.3.0.ebuild
deleted file mode 100644
index 1e5db336a19d..000000000000
--- a/net-misc/cgminer/cgminer-2.3.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.3.0.ebuild,v 1.3 2012/02/24 22:00:33 blueness Exp $
-
-EAPI="4"
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
-HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="+adl altivec bitforce +cpumining examples hardened icarus +opencl padlock sse2 sse2_4way sse4"
-REQUIRED_USE="
-	|| ( bitforce cpumining icarus opencl )
-	adl? ( opencl )
-	altivec? ( cpumining ppc ppc64 )
-	padlock? ( cpumining || ( amd64 x86 ) )
-	sse2? ( cpumining || ( amd64 x86 ) )
-	sse4? ( cpumining amd64 )
-"
-
-DEPEND="
-	net-misc/curl
-	sys-libs/ncurses
-	dev-libs/jansson
-	opencl? (
-		virtual/opencl
-	)
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	sys-apps/sed
-	adl? (
-		x11-libs/amd-adl-sdk
-	)
-	sse2? (
-		>=dev-lang/yasm-1.0.1
-	)
-	sse4? (
-		>=dev-lang/yasm-1.0.1
-	)
-"
-
-src_prepare() {
-	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
-	ln -s /usr/include/ADL/* ADL_SDK/
-}
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	if ! use altivec; then
-		sed -i 's/-faltivec//g' configure
-	else
-		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
-	fi
-	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
-	if use sse2; then
-		if use amd64; then
-			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
-		else
-			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
-		fi
-	fi
-	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
-	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable adl) \
-		$(use_enable bitforce) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_enable opencl)
-	if use opencl; then
-		# sanitize directories
-		sed -i 's/^(\#define CGMINER_PREFIX ).*$/\1"'"${EPREFIX}/usr/share/cgminer"'"/' config.h
-	fi
-}
-
-src_install() {
-	dobin cgminer
-	dodoc AUTHORS NEWS README
-	if use opencl; then
-		insinto /usr/share/cgminer
-		doins *.cl
-	fi
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c
-	fi
-}
diff --git a/net-misc/cgminer/cgminer-2.3.1.2.ebuild b/net-misc/cgminer/cgminer-2.3.1.2.ebuild
deleted file mode 100644
index 4f39d0bf71e4..000000000000
--- a/net-misc/cgminer/cgminer-2.3.1.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.3.1.2.ebuild,v 1.1 2012/02/24 22:00:33 blueness Exp $
-
-EAPI="4"
-
-inherit versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
-HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="+adl altivec bitforce +cpumining examples hardened icarus +opencl padlock sse2 sse2_4way sse4"
-REQUIRED_USE="
-	|| ( bitforce cpumining icarus opencl )
-	adl? ( opencl )
-	altivec? ( cpumining ppc ppc64 )
-	padlock? ( cpumining || ( amd64 x86 ) )
-	sse2? ( cpumining || ( amd64 x86 ) )
-	sse4? ( cpumining amd64 )
-"
-
-DEPEND="
-	net-misc/curl
-	sys-libs/ncurses
-	dev-libs/jansson
-	opencl? (
-		virtual/opencl
-	)
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	sys-apps/sed
-	adl? (
-		x11-libs/amd-adl-sdk
-	)
-	sse2? (
-		>=dev-lang/yasm-1.0.1
-	)
-	sse4? (
-		>=dev-lang/yasm-1.0.1
-	)
-"
-
-src_prepare() {
-	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
-	ln -s /usr/include/ADL/* ADL_SDK/
-}
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	if ! use altivec; then
-		sed -i 's/-faltivec//g' configure
-	else
-		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
-	fi
-	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
-	if use sse2; then
-		if use amd64; then
-			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
-		else
-			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
-		fi
-	fi
-	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
-	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable adl) \
-		$(use_enable bitforce) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_enable opencl)
-	if use opencl; then
-		# sanitize directories
-		sed -i 's/^(\#define CGMINER_PREFIX ).*$/\1"'"${EPREFIX}/usr/share/cgminer"'"/' config.h
-	fi
-}
-
-src_install() {
-	dobin cgminer
-	dodoc AUTHORS NEWS README
-	if use opencl; then
-		insinto /usr/share/cgminer
-		doins *.cl
-	fi
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c
-	fi
-}
diff --git a/net-misc/cgminer/cgminer-2.3.3.ebuild b/net-misc/cgminer/cgminer-2.3.3.ebuild
deleted file mode 100644
index f6293910350d..000000000000
--- a/net-misc/cgminer/cgminer-2.3.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.3.3.ebuild,v 1.1 2012/04/15 16:21:13 blueness Exp $
-
-EAPI="4"
-
-inherit versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
-HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
-SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4"
-REQUIRED_USE="
-	|| ( bitforce cpumining icarus opencl )
-	adl? ( opencl )
-	altivec? ( cpumining ppc ppc64 )
-	padlock? ( cpumining || ( amd64 x86 ) )
-	sse2? ( cpumining || ( amd64 x86 ) )
-	sse4? ( cpumining amd64 )
-"
-
-DEPEND="
-	net-misc/curl
-	ncurses? (
-		sys-libs/ncurses
-	)
-	dev-libs/jansson
-	opencl? (
-		virtual/opencl
-	)
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	sys-apps/sed
-	adl? (
-		x11-libs/amd-adl-sdk
-	)
-	sse2? (
-		>=dev-lang/yasm-1.0.1
-	)
-	sse4? (
-		>=dev-lang/yasm-1.0.1
-	)
-"
-
-src_prepare() {
-	sed -i 's/\(^\#define WANT_.*\(SSE\|PADLOCK\|ALTIVEC\)\)/\/\/ \1/' miner.h
-	ln -s /usr/include/ADL/* ADL_SDK/
-}
-
-src_configure() {
-	local CFLAGS="${CFLAGS}"
-	if ! use altivec; then
-		sed -i 's/-faltivec//g' configure
-	else
-		CFLAGS="${CFLAGS} -DWANT_ALTIVEC=1"
-	fi
-	use padlock && CFLAGS="${CFLAGS} -DWANT_VIA_PADLOCK=1"
-	if use sse2; then
-		if use amd64; then
-			CFLAGS="${CFLAGS} -DWANT_X8664_SSE2=1"
-		else
-			CFLAGS="${CFLAGS} -DWANT_X8632_SSE2=1"
-		fi
-	fi
-	use sse2_4way && CFLAGS="${CFLAGS} -DWANT_SSE2_4WAY=1"
-	use sse4 && CFLAGS="${CFLAGS} -DWANT_X8664_SSE4=1"
-	use hardened && CFLAGS="${CFLAGS} -nopie"
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_enable adl) \
-		$(use_enable bitforce) \
-		$(use_enable cpumining) \
-		$(use_enable icarus) \
-		$(use_with ncurses curses) \
-		$(use_enable opencl)
-	if use opencl; then
-		# sanitize directories
-		sed -i 's/^(\#define CGMINER_PREFIX ).*$/\1"'"${EPREFIX}/usr/share/cgminer"'"/' config.h
-	fi
-}
-
-src_install() {
-	dobin cgminer
-	dodoc AUTHORS NEWS README
-	if use opencl; then
-		insinto /usr/share/cgminer
-		doins *.cl
-	fi
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c
-	fi
-}
diff --git a/net-misc/cgminer/cgminer-2.3.2.ebuild b/net-misc/cgminer/cgminer-2.3.4.ebuild
index 3bd169150d55..4ab273910219 100644
--- a/net-misc/cgminer/cgminer-2.3.2.ebuild
+++ b/net-misc/cgminer/cgminer-2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.3.2.ebuild,v 1.1 2012/04/02 13:03:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.3.4.ebuild,v 1.1 2012/04/27 10:16:47 blueness Exp $
 
 EAPI="4"
 
@@ -13,13 +13,13 @@ DESCRIPTION="Bitcoin CPU/GPU/FPGA miner in C"
 HOMEPAGE="https://bitcointalk.org/index.php?topic=28402.0"
 SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-${MY_PV}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 
-IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4"
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
 REQUIRED_USE="
-	|| ( bitforce cpumining icarus opencl )
+	|| ( bitforce cpumining icarus opencl ztex )
 	adl? ( opencl )
 	altivec? ( cpumining ppc ppc64 )
 	padlock? ( cpumining || ( amd64 x86 ) )
@@ -36,6 +36,12 @@ DEPEND="
 	opencl? (
 		virtual/opencl
 	)
+	udev? (
+		sys-fs/udev
+	)
+	ztex? (
+		dev-libs/libusb:1
+	)
 "
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
@@ -83,10 +89,15 @@ src_configure() {
 		$(use_enable cpumining) \
 		$(use_enable icarus) \
 		$(use_with ncurses curses) \
-		$(use_enable opencl)
+		$(use_enable opencl) \
+		$(use_with udev libudev) \
+		$(use_enable ztex)
 	if use opencl; then
 		# sanitize directories
-		sed -i 's/^(\#define CGMINER_PREFIX ).*$/\1"'"${EPREFIX}/usr/share/cgminer"'"/' config.h
+		sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer/opencl"'"~' config.h
+	fi
+	if use ztex; then
+		sed -i 's~bitstreams/~'"${EPREFIX}"'/usr/lib/cgminer/ztex/~' libztex.c
 	fi
 }
 
@@ -94,9 +105,13 @@ src_install() {
 	dobin cgminer
 	dodoc AUTHORS NEWS README
 	if use opencl; then
-		insinto /usr/share/cgminer
+		insinto /usr/lib/cgminer/opencl
 		doins *.cl
 	fi
+	if use ztex; then
+		insinto /usr/lib/cgminer/ztex
+		doins bitstreams/*.bit
+	fi
 	if use examples; then
 		docinto examples
 		dodoc api-example.php miner.php API.java api-example.c
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index a3b8340c61b1..d4c0d5fa85f5 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/metadata.xml
@@ -18,5 +18,6 @@
 		<flag name='padlock'>Enable support for mining with VIA Padlock CPUs</flag>
 		<flag name='sse2_4way'>Enable support for CPU SSE2 4way mining algorithm</flag>
 		<flag name='sse4'>Enable support for CPU SSE4 mining algorithm</flag>
+		<flag name='ztex'>Enable support for mining with Ztex FPGAs</flag>
 	</use>
 </pkgmetadata>