Version bump

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 141 insertions, 4 deletions

diff --git a/net-misc/cgminer/ChangeLog b/net-misc/cgminer/ChangeLog
index 3e0bff3fd2df..3e2ccd07348d 100644
--- a/net-misc/cgminer/ChangeLog
+++ b/net-misc/cgminer/ChangeLog
@@ -1,5 +1,11 @@
 
 
+*cgminer-2.4.0 (05 May 2012)
+
+  05 May 2012; Anthony G. Basile <blueness@gentoo.org> cgminer-2.3.6.ebuild,
+  +cgminer-2.4.0.ebuild:
+  Version bump
+
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> cgminer-2.3.4.ebuild,
   cgminer-2.3.5.ebuild, cgminer-2.3.6.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index d7c22d221fb5..df90f2c96f73 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST cgminer-2.3.4.tar.bz2 2702979 RMD160 d399e63f9c50d3807939a3aeee1efe20a25b0239 SHA1 2eea780d34703a0a20ee00991ed378af993329f7 SHA256 5d5ed714144421a543ca31b349c98e3a1e789c6ab3e490557cb870badfb58a3e
 DIST cgminer-2.3.5.tar.bz2 4470889 RMD160 49f349ca8e506534426ed0d957b8709f3b50d272 SHA1 4496eaddc08708bbe3e2672a644c6ff0cbbf59fc SHA256 da526ee646c0142af84534ce4d1984cd45f0a62cf5f1c1832f0df771fedfdccd
 DIST cgminer-2.3.6.tar.bz2 4471825 RMD160 9496c804574d25fd3c79c313d12bd3cbfba44c1e SHA1 4b08cbc2cf5b4e3d1c89dc651e7b8aa8cb76e1d5 SHA256 792c8a2be9f6e8e6e182a6d6459a6becd5263a05e5dedc315b5665a2e0fa105c
+DIST cgminer-2.4.0.tar.bz2 4473741 RMD160 92789ad524bcd432b6e1957251f8ae93be3f78f3 SHA1 5a8acef5be358a794b42aeb139ea7a37c5ab74e5 SHA256 30a0c018094c93b1f915b67f5cad8cd935838e1ffac862aa6d05ee37f3fbb387
 EBUILD cgminer-2.3.4.ebuild 2673 RMD160 76fd7717d0ea62635e8df1e305b82dcb7b494bfd SHA1 77735c289a87b9720fc2ea2f6fa750a55ae12a51 SHA256 2fef82cd07c05f5a95e7dd00f556aa6e5c2fc7d41280b72adac9a8e3b9317d3c
 EBUILD cgminer-2.3.5.ebuild 2673 RMD160 39219734602db45edcef743b526c579c5d2af090 SHA1 91fbf106cd20b53f12b2bb34a276f57eba9cc4f9 SHA256 c6877d9745642e26966e7c393d028b672035e8c2145cbfa29487bdd658270107
-EBUILD cgminer-2.3.6.ebuild 2663 RMD160 26889d6a1837ea4d4b5395b6a8748163ff8b2d8b SHA1 a105aae231ca69e6f7014da2cc014ff3ce6a1b0d SHA256 ef6acac80892dcd485ecf1481036b3a8a5bf9fce456b362fc979d2cc990fa05d
-MISC ChangeLog 1632 RMD160 e49f41bc0632264259e63e5f12a3b70dbddbc38e SHA1 a3a967bf0cb61e7128edce95929cdccfb57e7d2a SHA256 117f28a7698787a97d1c3d642355e01073c3dd7c5ec606edbbfd241530d2adcf
+EBUILD cgminer-2.3.6.ebuild 2675 RMD160 c6fa4db37a47ee143e21eeb142e93be7f132ff6c SHA1 a9e2432a72ac1ea77cf89bf6cbc0c770222e26c3 SHA256 5bd4ca354fe4ce788468ba146686cbf809416fc0f00ff2f03021dbf35286adaa
+EBUILD cgminer-2.4.0.ebuild 2665 RMD160 61647e99e6e65eed0f11842c797fdb378a6ab46b SHA1 be42cc658f4c8e87cd0f1d772bd2563c20673a7d SHA256 b1e3bd4ee48e699ad2d4c13b0e3972915aedaa34174de793a751d0b1580b774e
+MISC ChangeLog 1780 RMD160 990c7fc81ee98bd99118e5f2b9aa012774eda448 SHA1 88eeba6f5e7b0952640d841a1e6cceaa560b358d SHA256 01cfed0b50b5876e16b709ce657b3d88df2d412d7011bc5784c2b511a98824c7
 MISC metadata.xml 1098 RMD160 864abfef4005518c2df14acb829db75a38ac3500 SHA1 59ed15a1fbc68fd0bfcaaa4b03bf856d3dc03fff SHA256 ed814f6cd717e693851941385a0349617a99733f948c3a412a9699d01f283dc5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk+lRF0ACgkQl5yvQNBFVTUqGgCeNFSDdLkaVrooPQe2LNI4UH1Y
+iQcAn2HV/kTMrz1aFbYCeG/oBD44SjL8
+=6w80
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cgminer/cgminer-2.3.6.ebuild b/net-misc/cgminer/cgminer-2.3.6.ebuild
index 1a05420d5817..11fe01aa89a0 100644
--- a/net-misc/cgminer/cgminer-2.3.6.ebuild
+++ b/net-misc/cgminer/cgminer-2.3.6.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.6.ebuild,v 1.2 2012/05/05 03:20:40 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-2.3.6.ebuild,v 1.3 2012/05/05 15:16:35 blueness Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ 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"
+SRC_URI="http://ck.kolivas.org/apps/${PN}/${PN}-2.3/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/cgminer/cgminer-2.4.0.ebuild b/net-misc/cgminer/cgminer-2.4.0.ebuild
new file mode 100644
index 000000000000..1ed515a2e593
--- /dev/null
+++ b/net-misc/cgminer/cgminer-2.4.0.ebuild
@@ -0,0 +1,119 @@
+# 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.4.0.ebuild,v 1.1 2012/05/05 15:16:35 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-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="+adl altivec bitforce +cpumining examples hardened icarus ncurses +opencl padlock sse2 sse2_4way sse4 +udev ztex"
+REQUIRED_USE="
+	|| ( bitforce cpumining icarus opencl ztex )
+	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
+	)
+	udev? (
+		sys-fs/udev
+	)
+	ztex? (
+		dev-libs/libusb:1
+	)
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/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) \
+		$(use_with udev libudev) \
+		$(use_enable ztex)
+	if use opencl; then
+		# sanitize directories
+		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
+}
+
+src_install() {
+	dobin cgminer
+	dodoc AUTHORS NEWS README
+	if use opencl; then
+		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
+	fi
+}