Version bump 4.3.5, use system libjansson. Remove older 4.3.x

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

4 files changed, 65 insertions, 100 deletions

diff --git a/net-misc/cgminer/ChangeLog b/net-misc/cgminer/ChangeLog
index 352bd4adfda6..5868d6037140 100644
--- a/net-misc/cgminer/ChangeLog
+++ b/net-misc/cgminer/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2014/05/25 20:49:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/ChangeLog,v 1.74 2014/06/10 18:35:58 blueness Exp $
+
+*cgminer-4.3.5 (10 Jun 2014)
+
+  10 Jun 2014; Anthony G. Basile <blueness@gentoo.org> +cgminer-4.3.5.ebuild,
+  +files/cgminer-4.3.5-system-jansson.patch, -cgminer-4.3.0.ebuild,
+  -cgminer-4.3.2.ebuild:
+  Version bump 4.3.5, use system libjansson.  Remove older 4.3.x
 
 *cgminer-4.3.4 (25 May 2014)
 
diff --git a/net-misc/cgminer/cgminer-4.3.2.ebuild b/net-misc/cgminer/cgminer-4.3.2.ebuild
deleted file mode 100644
index 452b1792cbae..000000000000
--- a/net-misc/cgminer/cgminer-4.3.2.ebuild
+++ /dev/null
@@ -1,88 +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/cgminer/cgminer-4.3.2.ebuild,v 1.2 2014/05/25 20:49:40 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/4.3/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HARDWARE="ants1 avalon avalon2 bab bitmine_A1 bflsc bitforce bitfury cointerra drillbit hashfast icarus klondike knc minion modminer spondoolies"
-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 )
-	spondoolies? ( virtual/libusb:1 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	use hardened && append-cflags "-nopie"
-
-	econf $(use_with ncurses curses) \
-		$(use_enable ants1) \
-		$(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) \
-		$(use_enable spondoolies)
-	# 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/cgminer-4.3.0.ebuild b/net-misc/cgminer/cgminer-4.3.5.ebuild
index f959e77ab288..596dfdd65eef 100644
--- a/net-misc/cgminer/cgminer-4.3.0.ebuild
+++ b/net-misc/cgminer/cgminer-4.3.5.ebuild
@@ -1,15 +1,15 @@
 # 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.3.0.ebuild,v 1.2 2014/05/02 12:41:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgminer/cgminer-4.3.5.ebuild,v 1.1 2014/06/10 18:35:58 blueness Exp $
 
 EAPI=5
 
-inherit autotools flag-o-matic
+inherit autotools eutils 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/4.3/${P}.tar.bz2"
+SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
+#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.3/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -21,7 +21,7 @@ IUSE="doc examples udev hardened ncurses ${HARDWARE}"
 REQUIRED_USE="|| ( ${HARDWARE} )"
 
 RDEPEND="net-misc/curl
-	dev-libs/jansson
+	>=dev-libs/jansson-2.5
 	ncurses? ( sys-libs/ncurses )
 	avalon? ( virtual/libusb:1 )
 	bflsc? ( virtual/libusb:1 )
@@ -38,6 +38,7 @@ DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-system-jansson.patch
 	eautoreconf
 }
 
@@ -61,26 +62,24 @@ src_configure() {
 		$(use_enable knc) \
 		$(use_enable minion) \
 		$(use_enable modminer) \
-		$(use_enable spondoolies)
+		$(use_enable spondoolies) \
+		--with-system-libusb
 	# 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
diff --git a/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch b/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch
new file mode 100644
index 000000000000..bfe14311740e
--- /dev/null
+++ b/net-misc/cgminer/files/cgminer-4.3.5-system-jansson.patch
@@ -0,0 +1,47 @@
+diff -Naur cgminer-4.3.5.orig/compat/Makefile.am cgminer-4.3.5/compat/Makefile.am
+--- cgminer-4.3.5.orig/compat/Makefile.am	2013-11-30 16:24:45.000000000 -0500
++++ cgminer-4.3.5/compat/Makefile.am	2014-06-10 09:50:07.363965296 -0400
+@@ -1,8 +1,5 @@
+-
+-SUBDIRS	= jansson-2.5
+-
+ if WANT_USBUTILS
+ if WANT_STATIC_LIBUSB
+-SUBDIRS += libusb-1.0
++SUBDIRS = libusb-1.0
+ endif
+ endif
+diff -Naur cgminer-4.3.5.orig/configure.ac cgminer-4.3.5/configure.ac
+--- cgminer-4.3.5.orig/configure.ac	2014-06-09 21:40:35.000000000 -0400
++++ cgminer-4.3.5/configure.ac	2014-06-10 09:49:42.306964156 -0400
+@@ -405,8 +405,7 @@
+ 
+ AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
+ 
+-AC_CONFIG_SUBDIRS([compat/jansson-2.5])
+-JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"
++JANSSON_LIBS="-ljansson"
+ 
+ PKG_PROG_PKG_CONFIG()
+ 
+diff -Naur cgminer-4.3.5.orig/Makefile.am cgminer-4.3.5/Makefile.am
+--- cgminer-4.3.5.orig/Makefile.am	2014-06-09 20:29:40.000000000 -0400
++++ cgminer-4.3.5/Makefile.am	2014-06-10 09:49:56.153964786 -0400
+@@ -1,8 +1,6 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-JANSSON_CPPFLAGS= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
+-
+ if WANT_USBUTILS
+ USBUTILS_CPPFLAGS = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
+ else
+@@ -18,7 +16,7 @@
+ 
+ SUBDIRS		= lib compat ccan
+ 
+-cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_CPPFLAGS) $(USBUTILS_CPPFLAGS)
++cgminer_CPPFLAGS = $(PTHREAD_FLAGS) -fno-strict-aliasing $(USBUTILS_CPPFLAGS)
+ 
+ bin_PROGRAMS	= cgminer
+