Version bumps and cleanup

(Portage version: 2.1.10.65/cvs/Linux x86_64)

11 files changed, 24 insertions, 691 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 004fc49092a2..3f70913b1619 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,21 @@
 # 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.34 2012/06/21 00:23:07 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.35 2012/06/26 02:34:02 blueness Exp $
+
+*bitcoind-0.6.3 (26 Jun 2012)
+*bitcoind-0.6.0.9_rc1 (26 Jun 2012)
+*bitcoind-0.5.6_rc3 (26 Jun 2012)
+*bitcoind-0.4.7_rc3 (26 Jun 2012)
+
+  26 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -files/0.4.5-reopen_log_file.patch, -bitcoind-0.4.7_rc2.ebuild,
+  +bitcoind-0.4.7_rc3.ebuild, +bitcoind-0.5.6_rc3.ebuild,
+  -bitcoind-0.6.0.7.ebuild, -bitcoind-0.6.0.8_rc2.ebuild,
+  -files/0.6.0-reopen_log_file.patch, +bitcoind-0.6.0.9_rc1.ebuild,
+  -files/0.6.1-reopen_log_file.patch, -bitcoind-0.5.5.ebuild,
+  -bitcoind-0.6.0.8_rc1.ebuild, -bitcoind-0.6.2.ebuild, 
+  -files/bitcoind-remove-debug.patch:
+  Version bumps and cleanup
 
   21 Jun 2012; Jeff Horelick <jdhore@gentoo.org> bitcoind-0.5.6_rc2.ebuild:
   marked x86 per bug 422219
diff --git a/net-p2p/bitcoind/bitcoind-0.4.7_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild
index 7e854c39639d..2cd98008eda4 100644
--- a/net-p2p/bitcoind/bitcoind-0.4.7_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.4.7_rc3.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.7_rc2.ebuild,v 1.1 2012/06/16 22:31:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.4.7_rc3.ebuild,v 1.1 2012/06/26 02:34:02 blueness Exp $
 
 EAPI=4
 
diff --git a/net-p2p/bitcoind/bitcoind-0.5.5.ebuild b/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild
index 816bde2f138b..db15d5ade407 100644
--- a/net-p2p/bitcoind/bitcoind-0.5.5.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.5.6_rc3.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.5.ebuild,v 1.3 2012/05/21 22:52:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.5.6_rc3.ebuild,v 1.1 2012/06/26 02:34:02 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 )
 	)
@@ -19,7 +19,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/}
 
 LICENSE="MIT ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+bip16 +eligius examples logrotate ssl upnp"
 
 RDEPEND="
@@ -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.6.0.7.ebuild b/net-p2p/bitcoind/bitcoind-0.6.0.7.ebuild
deleted file mode 100644
index 773d8ab3196c..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.6.0.7.ebuild
+++ /dev/null
@@ -1,114 +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.6.0.7.ebuild,v 1.1 2012/05/14 23:23:44 blueness Exp $
-
-EAPI="4"
-
-DB_VER="4.8"
-
-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
-	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 logrotate ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	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-bitcoind-stable"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.6.0-eligius_sendfee.patch"
-	use logrotate && epatch "${FILESDIR}/0.6.0-reopen_log_file.patch"
-}
-
-src_compile() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
-
-	OPTS+=("DEBUGFLAGS=")
-	OPTS+=("CXXFLAGS=${CXXFLAGS}")
-	OPTS+=("LDFLAGS=${LDFLAGS}")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${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_INCLUDE_PATH=${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	use ssl  && OPTS+=(USE_SSL=1)
-	if use upnp; then
-		OPTS+=(USE_UPNP=1)
-	else
-		OPTS+=(USE_UPNP=)
-	fi
-
-	cd src || die
-	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}
-
-	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 examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,pyminer,wallettools}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
-	fi
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.6.0.8_rc1.ebuild b/net-p2p/bitcoind/bitcoind-0.6.0.8_rc1.ebuild
deleted file mode 100644
index 5c83d08e0e39..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.6.0.8_rc1.ebuild
+++ /dev/null
@@ -1,114 +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.6.0.8_rc1.ebuild,v 1.1 2012/05/14 23:23:44 blueness Exp $
-
-EAPI="4"
-
-DB_VER="4.8"
-
-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
-	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 logrotate ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	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-bitcoind-stable"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.6.0-eligius_sendfee.patch"
-	use logrotate && epatch "${FILESDIR}/0.6.0-reopen_log_file.patch"
-}
-
-src_compile() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
-
-	OPTS+=("DEBUGFLAGS=")
-	OPTS+=("CXXFLAGS=${CXXFLAGS}")
-	OPTS+=("LDFLAGS=${LDFLAGS}")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${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_INCLUDE_PATH=${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	use ssl  && OPTS+=(USE_SSL=1)
-	if use upnp; then
-		OPTS+=(USE_UPNP=1)
-	else
-		OPTS+=(USE_UPNP=)
-	fi
-
-	cd src || die
-	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}
-
-	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 examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,pyminer,wallettools}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
-	fi
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.6.0.8_rc2.ebuild b/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild
index 18a8c6082ce6..ae1228a09736 100644
--- a/net-p2p/bitcoind/bitcoind-0.6.0.8_rc2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.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.6.0.8_rc2.ebuild,v 1.1 2012/06/16 22:31:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.6.0.9_rc1.ebuild,v 1.1 2012/06/26 02:34:02 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
-	http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz
+	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
 "
 
 LICENSE="MIT ISC"
diff --git a/net-p2p/bitcoind/bitcoind-0.6.2.ebuild b/net-p2p/bitcoind/bitcoind-0.6.2.ebuild
deleted file mode 100644
index bebdbede9756..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.6.2.ebuild
+++ /dev/null
@@ -1,113 +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.6.2.ebuild,v 1.1 2012/05/14 23:23:44 blueness Exp $
-
-EAPI="4"
-
-DB_VER="4.8"
-
-inherit db-use eutils versionator toolchain-funcs
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz
-"
-
-LICENSE="MIT ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+eligius examples logrotate upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	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-bitcoin-06d764e"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.6.1-eligius_sendfee.patch"
-	use logrotate && epatch "${FILESDIR}/0.6.1-reopen_log_file.patch"
-}
-
-src_compile() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER BOOST_INC
-
-	OPTS+=("DEBUGFLAGS=")
-	OPTS+=("CXXFLAGS=${CXXFLAGS}")
-	OPTS+=("LDFLAGS=${LDFLAGS}")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${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_INCLUDE_PATH=${BOOST_INC}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	if use upnp; then
-		OPTS+=(USE_UPNP=1)
-	else
-		OPTS+=(USE_UPNP=)
-	fi
-
-	cd src || die
-	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}
-
-	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 examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,pyminer,wallettools}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
-	fi
-}
diff --git a/net-p2p/bitcoind/files/0.4.5-reopen_log_file.patch b/net-p2p/bitcoind/files/0.4.5-reopen_log_file.patch
deleted file mode 100644
index 1d0ee2ae3275..000000000000
--- a/net-p2p/bitcoind/files/0.4.5-reopen_log_file.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/src/init.cpp b/src/init.cpp
-index 2dccc81..630fc29 100644
---- a/src/init.cpp
-+++ b/src/init.cpp
-@@ -8,6 +8,7 @@
- #include "net.h"
- #include "init.h"
- #include "strlcpy.h"
-+#include "util.h"
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/fstream.hpp>
- #include <boost/interprocess/sync/file_lock.hpp>
-@@ -71,6 +72,10 @@ void HandleSIGTERM(int)
-     fRequestShutdown = true;
- }
- 
-+void HandleSIGHUP(int)
-+{
-+    fReopenDebugLog = true;
-+}
- 
- 
- 
-@@ -132,7 +137,13 @@ bool AppInit2(int argc, char* argv[])
-     sa.sa_flags = 0;
-     sigaction(SIGTERM, &sa, NULL);
-     sigaction(SIGINT, &sa, NULL);
--    sigaction(SIGHUP, &sa, NULL);
-+
-+    // Reopen debug.log on SIGHUP
-+    struct sigaction sa_hup;
-+    sa_hup.sa_handler = HandleSIGHUP;
-+    sigemptyset(&sa_hup.sa_mask);
-+    sa_hup.sa_flags = 0;
-+    sigaction(SIGHUP, &sa_hup, NULL);
- #endif
- 
-     //
-diff --git a/src/util.cpp b/src/util.cpp
-index 0f496bc..736fac6 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -30,6 +30,8 @@ string strMiscWarning;
- bool fTestNet = false;
- bool fNoListen = false;
- bool fLogTimestamps = false;
-+FILE* fileout = NULL;
-+bool fReopenDebugLog = false;
- 
- 
- 
-@@ -154,6 +156,13 @@ int GetRandInt(int nMax)
- 
- 
- 
-+string GetDebugLogName()
-+{
-+    char pszFile[MAX_PATH+100];
-+    GetDataDir(pszFile);
-+    strlcat(pszFile, "/debug.log", sizeof(pszFile));
-+    return pszFile;
-+}
- 
- inline int OutputDebugStringF(const char* pszFormat, ...)
- {
-@@ -169,19 +178,27 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-     else
-     {
-         // print to debug.log
--        static FILE* fileout = NULL;
- 
-         if (!fileout)
-         {
--            char pszFile[MAX_PATH+100];
--            GetDataDir(pszFile);
--            strlcat(pszFile, "/debug.log", sizeof(pszFile));
-+            const char* pszFile = GetDebugLogName().c_str();
-             fileout = fopen(pszFile, "a");
-             if (fileout) setbuf(fileout, NULL); // unbuffered
-         }
-         if (fileout)
-         {
-             static bool fStartedNewLine = true;
-+#ifndef WIN32
-+            flockfile(fileout);
-+
-+            // reopen the log file, if requested
-+            if (fReopenDebugLog) {
-+                fReopenDebugLog = false;
-+                const char* pszFile = GetDebugLogName().c_str();
-+                if (freopen(pszFile,"a",fileout) != NULL)
-+                    setbuf(fileout, NULL); // unbuffered
-+            }
-+#endif
- 
-             // Debug print useful for profiling
-             if (fLogTimestamps && fStartedNewLine)
-@@ -195,6 +212,9 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-             va_start(arg_ptr, pszFormat);
-             ret = vfprintf(fileout, pszFormat, arg_ptr);
-             va_end(arg_ptr);
-+#ifndef WIN32
-+            funlockfile(fileout);
-+#endif
-         }
-     }
- 
-diff --git a/src/util.h b/src/util.h
-index 4e4cbb9..d2c19c9 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -166,6 +166,7 @@ extern std::string strMiscWarning;
- extern bool fTestNet;
- extern bool fNoListen;
- extern bool fLogTimestamps;
-+extern bool fReopenDebugLog;
- 
- void RandAddSeed();
- void RandAddSeedPerfmon();
diff --git a/net-p2p/bitcoind/files/0.6.0-reopen_log_file.patch b/net-p2p/bitcoind/files/0.6.0-reopen_log_file.patch
deleted file mode 100644
index baf14ef275f6..000000000000
--- a/net-p2p/bitcoind/files/0.6.0-reopen_log_file.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/src/init.cpp b/src/init.cpp
-index 4078b7e..87a619f 100644
---- a/src/init.cpp
-+++ b/src/init.cpp
-@@ -8,6 +8,7 @@
- #include "net.h"
- #include "init.h"
- #include "strlcpy.h"
-+#include "util.h"
- #include <boost/filesystem.hpp>
- #include <boost/filesystem/fstream.hpp>
- #include <boost/filesystem/convenience.hpp>
-@@ -83,6 +84,10 @@ void HandleSIGTERM(int)
-     fRequestShutdown = true;
- }
- 
-+void HandleSIGHUP(int)
-+{
-+    fReopenDebugLog = true;
-+}
- 
- 
- 
-@@ -144,7 +149,13 @@ bool AppInit2(int argc, char* argv[])
-     sa.sa_flags = 0;
-     sigaction(SIGTERM, &sa, NULL);
-     sigaction(SIGINT, &sa, NULL);
--    sigaction(SIGHUP, &sa, NULL);
-+
-+    // Reopen debug.log on SIGHUP
-+    struct sigaction sa_hup;
-+    sa_hup.sa_handler = HandleSIGHUP;
-+    sigemptyset(&sa_hup.sa_mask);
-+    sa_hup.sa_flags = 0;
-+    sigaction(SIGHUP, &sa_hup, NULL);
- #endif
- 
-     //
-diff --git a/src/util.cpp b/src/util.cpp
-index 08752e6..ca4e53b 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -32,6 +32,8 @@ bool fTestNet = false;
- bool fNoListen = false;
- bool fLogTimestamps = false;
- CMedianFilter<int64> vTimeOffsets(200,0);
-+FILE* fileout = NULL;
-+bool fReopenDebugLog = false;
- 
- 
- 
-@@ -155,6 +157,13 @@ int GetRandInt(int nMax)
- 
- 
- 
-+string GetDebugLogName()
-+{
-+    char pszFile[MAX_PATH+100];
-+    GetDataDir(pszFile);
-+    strlcat(pszFile, "/debug.log", sizeof(pszFile));
-+    return pszFile;
-+}
- 
- inline int OutputDebugStringF(const char* pszFormat, ...)
- {
-@@ -170,19 +179,27 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-     else
-     {
-         // print to debug.log
--        static FILE* fileout = NULL;
- 
-         if (!fileout)
-         {
--            char pszFile[MAX_PATH+100];
--            GetDataDir(pszFile);
--            strlcat(pszFile, "/debug.log", sizeof(pszFile));
-+            const char* pszFile = GetDebugLogName().c_str();
-             fileout = fopen(pszFile, "a");
-             if (fileout) setbuf(fileout, NULL); // unbuffered
-         }
-         if (fileout)
-         {
-             static bool fStartedNewLine = true;
-+#ifndef WIN32
-+            flockfile(fileout);
-+
-+            // reopen the log file, if requested
-+            if (fReopenDebugLog) {
-+                fReopenDebugLog = false;
-+                const char* pszFile = GetDebugLogName().c_str();
-+                if (freopen(pszFile,"a",fileout) != NULL)
-+                    setbuf(fileout, NULL); // unbuffered
-+            }
-+#endif
- 
-             // Debug print useful for profiling
-             if (fLogTimestamps && fStartedNewLine)
-@@ -196,6 +213,9 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-             va_start(arg_ptr, pszFormat);
-             ret = vfprintf(fileout, pszFormat, arg_ptr);
-             va_end(arg_ptr);
-+#ifndef WIN32
-+            funlockfile(fileout);
-+#endif
-         }
-     }
- 
-diff --git a/src/util.h b/src/util.h
-index 4fa5a08..5981ab6 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -123,6 +123,7 @@ extern std::string strMiscWarning;
- extern bool fTestNet;
- extern bool fNoListen;
- extern bool fLogTimestamps;
-+extern bool fReopenDebugLog;
- 
- void RandAddSeed();
- void RandAddSeedPerfmon();
diff --git a/net-p2p/bitcoind/files/0.6.1-reopen_log_file.patch b/net-p2p/bitcoind/files/0.6.1-reopen_log_file.patch
deleted file mode 100644
index d4a43f907f5f..000000000000
--- a/net-p2p/bitcoind/files/0.6.1-reopen_log_file.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff --git a/src/init.cpp b/src/init.cpp
-index 3fe6d1b..71379c1 100644
---- a/src/init.cpp
-+++ b/src/init.cpp
-@@ -80,6 +80,10 @@ void HandleSIGTERM(int)
-     fRequestShutdown = true;
- }
- 
-+void HandleSIGHUP(int)
-+{
-+    fReopenDebugLog = true;
-+}
- 
- 
- 
-@@ -141,7 +145,13 @@ bool AppInit2(int argc, char* argv[])
-     sa.sa_flags = 0;
-     sigaction(SIGTERM, &sa, NULL);
-     sigaction(SIGINT, &sa, NULL);
--    sigaction(SIGHUP, &sa, NULL);
-+
-+    // Reopen debug.log on SIGHUP
-+    struct sigaction sa_hup;
-+    sa_hup.sa_handler = HandleSIGHUP;
-+    sigemptyset(&sa_hup.sa_mask);
-+    sa_hup.sa_flags = 0;
-+    sigaction(SIGHUP, &sa_hup, NULL);
- #endif
- 
-     //
-diff --git a/src/util.cpp b/src/util.cpp
-index 3569f22..3b2e330 100644
---- a/src/util.cpp
-+++ b/src/util.cpp
-@@ -70,6 +70,8 @@ bool fTestNet = false;
- bool fNoListen = false;
- bool fLogTimestamps = false;
- CMedianFilter<int64> vTimeOffsets(200,0);
-+FILE* fileout = NULL;
-+bool fReopenDebugLog = false;
- 
- // Init openssl library multithreading support
- static boost::interprocess::interprocess_mutex** ppmutexOpenSSL;
-@@ -198,7 +200,6 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-     else
-     {
-         // print to debug.log
--        static FILE* fileout = NULL;
- 
-         if (!fileout)
-         {
-@@ -209,6 +210,17 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-         if (fileout)
-         {
-             static bool fStartedNewLine = true;
-+#ifndef WIN32
-+            flockfile(fileout);
-+
-+            // reopen the log file, if requested
-+            if (fReopenDebugLog) {
-+                fReopenDebugLog = false;
-+                boost::filesystem::path pathDebug = GetDataDir() / "debug.log";
-+                if (freopen(pathDebug.string().c_str(),"a",fileout) != NULL)
-+                    setbuf(fileout, NULL); // unbuffered
-+            }
-+#endif
- 
-             // Debug print useful for profiling
-             if (fLogTimestamps && fStartedNewLine)
-@@ -222,6 +234,9 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
-             va_start(arg_ptr, pszFormat);
-             ret = vfprintf(fileout, pszFormat, arg_ptr);
-             va_end(arg_ptr);
-+#ifndef WIN32
-+            funlockfile(fileout);
-+#endif
-         }
-     }
- 
-diff --git a/src/util.h b/src/util.h
-index 5f8d037..796b74a 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -125,6 +125,7 @@ extern std::string strMiscWarning;
- extern bool fTestNet;
- extern bool fNoListen;
- extern bool fLogTimestamps;
-+extern bool fReopenDebugLog;
- 
- void RandAddSeed();
- void RandAddSeedPerfmon();
diff --git a/net-p2p/bitcoind/files/bitcoind-remove-debug.patch b/net-p2p/bitcoind/files/bitcoind-remove-debug.patch
deleted file mode 100644
index 27da569a4329..000000000000
--- a/net-p2p/bitcoind/files/bitcoind-remove-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur bitcoin-bitcoind-stable.orig//src/makefile.unix bitcoin-bitcoind-stable/src/makefile.unix
---- bitcoin-bitcoind-stable.orig//src/makefile.unix	2012-03-11 22:21:06.000000000 -0400
-+++ bitcoin-bitcoind-stable/src/makefile.unix	2012-03-16 08:28:27.000000000 -0400
-@@ -85,7 +85,7 @@
- 
- DEBUGFLAGS=-g
- CXXFLAGS=-O2
--xCXXFLAGS=-pthread -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS)
-+xCXXFLAGS=-pthread -Wno-invalid-offsetof -Wformat $(DEFS) $(HARDENING) $(CXXFLAGS)
- HEADERS = \
-     base58.h \
-     bignum.h \