Remove broken 0.4.x, 0.5.x and add fixes

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 42 insertions, 124 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index d26671479573..50cda33dc734 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-p2p/bitcoind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.30 2012/05/21 22:52:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.31 2012/06/16 22:31:11 blueness Exp $
+
+*bitcoind-0.6.0.8_rc2 (16 Jun 2012)
+*bitcoind-0.5.6_rc2 (16 Jun 2012)
+*bitcoind-0.4.7_rc2 (16 Jun 2012)
+
+  16 Jun 2012; Anthony G. Basile <blueness@gentoo.org> -bitcoind-0.4.6.ebuild,
+  -bitcoind-0.4.7_rc1.ebuild, +bitcoind-0.4.7_rc2.ebuild,
+  -bitcoind-0.5.3.ebuild, -bitcoind-0.5.6_rc1.ebuild,
+  +bitcoind-0.5.6_rc2.ebuild, +bitcoind-0.6.0.8_rc2.ebuild:
+  Remove broken 0.4.x, 0.5.x and add fixes
+  See: https://bitcointalk.org/?topic=87660
 
   21 May 2012; Johannes Huber <johu@gentoo.org> bitcoind-0.5.5.ebuild:
   Stable for x86, wrt bug #415973
diff --git a/net-p2p/bitcoind/bitcoind-0.4.7_rc1.ebuild b/net-p2p/bitcoind/bitcoind-0.4.7_rc1.ebuild
deleted file mode 100644
index 4425db4208d5..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.4.7_rc1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.7_rc1.ebuild,v 1.1 2012/05/14 23:23:44 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-inherit db-use eutils versionator
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="http://gitorious.org/bitcoin/${PN}-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.4.4-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
-	eligius? (
-		!bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.4.5rc1-eligius_sendfee.patch.xz )
-	)
-"
-
-LICENSE="MIT ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bip16 +eligius logrotate ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/crypto++
-	dev-libs/openssl[-bindist]
-	logrotate? (
-		app-admin/logrotate
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-S="${WORKDIR}/bitcoin-${PN}-stable"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	cd src || die
-	cp "${FILESDIR}/0.4.2-Makefile.gentoo" "Makefile" || die
-	if use bip16; then
-		epatch "${WORKDIR}/0.4.4-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
-		use eligius && epatch "${FILESDIR}/0.4.4+bip16-eligius_sendfee.patch"
-	else
-		use eligius && epatch "${WORKDIR}/0.4.5rc1-eligius_sendfee.patch"
-	fi
-	use logrotate && epatch "${FILESDIR}/0.4.5-reopen_log_file.patch"
-}
-
-src_compile() {
-	local OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
-
-	OPTS+=("CXXFLAGS=${CXXFLAGS}")
-	OPTS+=( "LDFLAGS=${LDFLAGS}")
-
-	OPTS+=("DB_CXXFLAGS=-I$(db_includedir "${DB_VER}")")
-	OPTS+=("DB_LDFLAGS=-ldb_cxx-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	BOOST_INC="/usr/include/boost-${BOOST_VER}"
-	OPTS+=("BOOST_CXXFLAGS=-I${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	use ssl  && OPTS+=(USE_SSL=1)
-	use upnp && OPTS+=(USE_UPNP=1)
-
-	cd src || die
-	emake "${OPTS[@]}" ${PN}
-}
-
-src_install() {
-	dobin src/${PN}
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "${FILESDIR}/bitcoin.confd" ${PN}
-	newinitd "${FILESDIR}/bitcoin.initd" ${PN}
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/README
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
-	fi
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.4.6.ebuild b/net-p2p/bitcoind/bitcoind-0.4.7_rc2.ebuild
index 13fb1be806b4..7e854c39639d 100644
--- a/net-p2p/bitcoind/bitcoind-0.4.6.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.4.7_rc2.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-p2p/bitcoind/bitcoind-0.4.6.ebuild,v 1.1 2012/05/14 23:23:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.7_rc2.ebuild,v 1.1 2012/06/16 22:31:11 blueness Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit db-use eutils versionator
 DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="http://bitcoin.org/"
 SRC_URI="http://gitorious.org/bitcoin/${PN}-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.4.4-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
+	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.4.7-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
 	eligius? (
 		!bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.4.5rc1-eligius_sendfee.patch.xz )
 	)
@@ -50,12 +50,12 @@ src_prepare() {
 	cd src || die
 	cp "${FILESDIR}/0.4.2-Makefile.gentoo" "Makefile" || die
 	if use bip16; then
-		epatch "${WORKDIR}/0.4.4-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
+		epatch "${WORKDIR}/0.4.7-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
 		use eligius && epatch "${FILESDIR}/0.4.4+bip16-eligius_sendfee.patch"
 	else
 		use eligius && epatch "${WORKDIR}/0.4.5rc1-eligius_sendfee.patch"
 	fi
-	use logrotate && epatch "${FILESDIR}/0.4.5-reopen_log_file.patch"
+	use logrotate && epatch "${FILESDIR}/0.4.7-reopen_log_file.patch"
 }
 
 src_compile() {
diff --git a/net-p2p/bitcoind/bitcoind-0.5.6_rc1.ebuild b/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild
index 07b720c49bef..3929bf70dac1 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.6_rc1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.6_rc2.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-p2p/bitcoind/bitcoind-0.5.6_rc1.ebuild,v 1.1 2012/05/14 23:23:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.6_rc2.ebuild,v 1.1 2012/06/16 22:31:11 blueness Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ inherit db-use eutils versionator toolchain-funcs
 DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="http://bitcoin.org/"
 SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
+	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
 	eligius? (
 		!bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz )
 	)
@@ -48,12 +48,12 @@ pkg_setup() {
 src_prepare() {
 	cd src || die
 	if use bip16; then
-		epatch "${WORKDIR}/0.5.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
+		epatch "${WORKDIR}/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
 		use eligius && epatch "${FILESDIR}/0.5.0.5+bip16-eligius_sendfee.patch"
 	else
 		use eligius && epatch "${WORKDIR}/0.5.0.6rc1-eligius_sendfee.patch"
 	fi
-	use logrotate && epatch "${FILESDIR}/0.4.5-reopen_log_file.patch"
+	use logrotate && epatch "${FILESDIR}/0.4.7-reopen_log_file.patch"
 }
 
 src_compile() {
diff --git a/net-p2p/bitcoind/bitcoind-0.5.3.ebuild b/net-p2p/bitcoind/bitcoind-0.6.0.8_rc2.ebuild
index 46f433bea7ec..18a8c6082ce6 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.6.0.8_rc2.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-p2p/bitcoind/bitcoind-0.5.3.ebuild,v 1.5 2012/03/25 10:34:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.0.8_rc2.ebuild,v 1.1 2012/06/16 22:31:11 blueness Exp $
 
 EAPI="4"
 
@@ -11,17 +11,20 @@ inherit db-use eutils versionator toolchain-funcs
 DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
 HOMEPAGE="http://bitcoin.org/"
 SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/0.5.2-eligius_sendfee.patch.xz )
+	http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz
 "
 
 LICENSE="MIT ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+eligius examples ssl upnp"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+eligius examples logrotate ssl upnp"
 
 RDEPEND="
 	>=dev-libs/boost-1.41.0
 	dev-libs/openssl[-bindist]
+	logrotate? (
+		app-admin/logrotate
+	)
 	upnp? (
 		net-libs/miniupnpc
 	)
@@ -41,14 +44,15 @@ pkg_setup() {
 
 src_prepare() {
 	cd src || die
-	epatch "${FILESDIR}"/${PN}-remove-debug.patch
-	use eligius && epatch "${WORKDIR}/0.5.2-eligius_sendfee.patch"
+	use eligius && epatch "${WORKDIR}/0.6.0-eligius_sendfee.patch"
+	use logrotate && epatch "${FILESDIR}/0.6.0.8-reopen_log_file.patch"
 }
 
 src_compile() {
-	local OPTS=()
+	OPTS=()
 	local BOOST_PKG BOOST_VER BOOST_INC
 
+	OPTS+=("DEBUGFLAGS=")
 	OPTS+=("CXXFLAGS=${CXXFLAGS}")
 	OPTS+=("LDFLAGS=${LDFLAGS}")
 
@@ -73,6 +77,12 @@ src_compile() {
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" ${PN}
 }
 
+src_test() {
+	cd src || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_bitcoin
+	./test_bitcoin || die 'Tests failed'
+}
+
 src_install() {
 	dobin src/${PN}
 
@@ -96,4 +106,9 @@ src_install() {
 		docinto examples
 		dodoc -r contrib/{bitrpc,pyminer,wallettools}
 	fi
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
+	fi
 }