Version bumps and cleanup

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

12 files changed, 41 insertions, 710 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/Manifest b/net-p2p/bitcoind/Manifest
index 22a04838e335..be90764ff1fd 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,36 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.4.2-Makefile.gentoo 1845 RMD160 d08abd86b0c17d7b4ba20552fe04146c025fa0d4 SHA1 13017e850bd8e94864bc665a33bc7b959f92f3d5 SHA256 7ab3bf195862802f527c2016b126f7fba7d63a8b3e2048634011cdfa761cb750
 AUX 0.4.4+bip16-eligius_sendfee.patch 7210 RMD160 0279ef9dc89044efb17aaf0693b66ce04b0c007b SHA1 68fa40b2f8b0dba3c39e870a7508008d528e04b0 SHA256 5b7db8d1f55e2b9db5b6fca65b252f0eefefd3f248b57a0f8c927a0262f2e6eb
-AUX 0.4.5-reopen_log_file.patch 3140 RMD160 b6c535817ce3146af3e2a737e9defcf34ccf2458 SHA1 9a61bf4f1aeeb227610847584bb137cdfb5d174a SHA256 17d95c2492f5f860fd2ce01fe6bfa646afcc649b1e6c1af9b0a0fb7220b256de
 AUX 0.4.7-reopen_log_file.patch 2652 RMD160 c09879f3538a914e345cd5071079ea5332689026 SHA1 bb10c2a77dcee4894cbebf701bf8e1255885a773 SHA256 43fa0e4d6bc3abf5cf744fade98ff0269944c8903e766124f75f06fdb04936cd
 AUX 0.5.0.5+bip16-eligius_sendfee.patch 6739 RMD160 45dc281379c25b7406b2cb612e8e653e3898ced0 SHA1 01e56629ee138ad61ae4c51a2dc9fb7eb689a624 SHA256 2e16bca9106bcb8056efc5a60791226119ca011cd007e4b547de4c23f0d8e9a4
-AUX 0.6.0-reopen_log_file.patch 3154 RMD160 fa37aca9f389f77e6d07fae58cf97fb6f0223f8e SHA1 9063eb45d012bac0646b0a4a581f62d0d14642f8 SHA256 5adf72cb28f5769f8c515822d1c88fa6cb7d70a632683fdffbcdb6d5a0f66f5a
 AUX 0.6.0.8-reopen_log_file.patch 2671 RMD160 02338280c3401fa7d1a92825c6d3bf5410578f79 SHA1 b2c64893e489907347ab8fb2484a753514b87d9e SHA256 c8fb07548fa9e096c92e322f5d5201f20cd9f32ed52fdda395e243a18fca79e3
-AUX 0.6.1-reopen_log_file.patch 2563 RMD160 c6a858578c7f60de7a58a1e66b4921801e1ca343 SHA1 c76b4584eb4a187bef283674f785142142617020 SHA256 484a4917714379da5bac95e8ab1f963b597083d38fbefe7ea13743a81813e7c4
 AUX bitcoin.conf 80 RMD160 d55c1ac48956c33cf4bf231f21ea81a7b1adc244 SHA1 12406dc38cd00a8160cb4246b7a167f4319c6715 SHA256 541ae10cc2246b620de3e7efa97eee59efacf83d28ea5f1297a121d0708226d2
 AUX bitcoin.confd 238 RMD160 1f84716f3ac81da9b06b925913550acfe542f4b5 SHA1 138fefcfa996f62bd9113633bd8505df002f545c SHA256 72300b41d57325de5a5f2ddea449d5f414f278549fb665d60746707ee5de2549
 AUX bitcoin.initd 2481 RMD160 ea5398f2775eea17ab9a337650eef30e7912244d SHA1 356a3a0509c465bcc0ce67cfcc22aca745346e4e SHA256 5dace582c4bf05d893166794ce620ca13b794b695376030f7d319bb22a0c956a
-AUX bitcoind-remove-debug.patch 547 RMD160 b61cdfaf2aa55512b75ef856b3f0049ed1d43e1d SHA1 428f699f22d90eaeb7acbd667fe9fd370b99aac5 SHA256 5a939bd2e59338fefc26c7c0802732a9e42f6470c09c47fc32f3ffbebfbc328c
 AUX bitcoind.logrotate 110 RMD160 c253af0b4627017e35162b84c2b0cd9a2c88bbc5 SHA1 7a227f625231eacedd611c6b2cdddff508030a87 SHA256 9b469c67e7af914199d699ac76279f194010f154be91f8136eddeeddf623a475
 DIST 0.4.5rc1-eligius_sendfee.patch.xz 2544 RMD160 c4452568b22ad951079e144c726bbef44e4e4286 SHA1 2c15ca4138b4a353ea301ef586fa85a8146a1dfb SHA256 2f70462bd93da1294103d210819e7e9d5d8ae20a65e20f6cf1dd14e827e77e59
 DIST 0.4.7-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz 4864 RMD160 a814ffde906378ae7bd000db8727800890691ac5 SHA1 19f9ae06d293f75e7d6ed5ac470cc1c256fef717 SHA256 04fe50d2c8f9ed474e2f3e5bf9334d17d399d20bda2bf20e1dc5ed9a04a02df4
-DIST 0.5.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz 4884 RMD160 1e1d446c531544b1cebc6434686b9c97a43dfed5 SHA1 aaa0a3eb639e4c71f145bb158b604444cc92974e SHA256 1fc8804f27c3e5337ca05d2197f1bdbdb4d442dd80d549714926627f11465b70
 DIST 0.5.0.6rc1-eligius_sendfee.patch.xz 2532 RMD160 037893d15de2839de270189a6b2bf42136baecfc SHA1 7c935ba30972ec8248eedabf3d714e2c7ea1c56c SHA256 3bb8ce2945f359af329905d18747ffd934eaf5b68e080ef0d5f0236f2973111b
 DIST 0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz 4876 RMD160 531171412397f983044bbf2bc9b8c819d7af9677 SHA1 39236dc77e72c27ba2df4a27548eb7ed10f2d94e SHA256 96e00f51a3daa62e85eb1f47eb841f793e9114dcb59101327df1209a93283e08
 DIST 0.6.0-eligius_sendfee.patch.xz 1980 RMD160 09e6d35ec5d5ad8c73b160e3c175d348b9fc16a3 SHA1 bbffc7392fd67baeb0e73838ef90b3278fbd4e6a SHA256 049bce0aaa9ba6affa965ec2031ba0c58efef90a1e5cd6d9e6b8c480609088d0
-DIST 0.6.1-eligius_sendfee.patch.xz 1988 RMD160 74adb595508a9a951f33e64c0dde3680f23fac15 SHA1 84d3afe9837d97181d87d323017cafff217c197f SHA256 18c3d8ba7bdf26cff2f32cae9a72edecad56fa584e0b5c690c2c1b14b27f78d1
-DIST bitcoin-v0.4.7_rc2.tgz 1002960 RMD160 05daddb59ac895614034cb4f59f765f5ebbb712b SHA1 6c1d112b2f609b6cc8596f1180d13d38355e763b SHA256 c2a535f800d6c4e5a578a902e0157b49eed85a7fc529d03afa02338ff3fc09cd
-DIST bitcoin-v0.5.5.tgz 1113196 RMD160 1562383a1666c67607c1875b6fd70fba6c6989df SHA1 8debef34ab09bb4d64d7d9e095dc5dba02679a5d SHA256 d1e9f6a9d75f4a8ba646bb77b3301b7179770a116093b8004b8e35412c616bc7
+DIST bitcoin-v0.4.7_rc3.tgz 1003737 RMD160 478197db3f4aff5529f6d166ea516a97e3a86cf4 SHA1 e8e94f86f17fb18b8c0693286e9ce2c6c70be55a SHA256 e1440c5685776a3c46a5e0c1287f913f889ffa6c2f25c38940f87aa24977ca31
 DIST bitcoin-v0.5.6_rc2.tgz 1063028 RMD160 d9a0e8a58c874ec3b6a01fbe0f0186466d450125 SHA1 9e43fd8d718abd474f242cef2d1cf0404658837c SHA256 114997dbd03d0a562f5dc809bff976126890579577862b5a4f0d0b791223c784
-DIST bitcoin-v0.6.0.7.tgz 1353861 RMD160 8ce2b2e47d75720817d2469d621400eb87a0afbb SHA1 7df561d62b1b779a1e172b839486eae8056d4c09 SHA256 b7e82f8d2c6b306014f206df404d6e93b15482395bc6db30c7eb3d88f93ee5b1
-DIST bitcoin-v0.6.0.8_rc1.tgz 1347231 RMD160 71095e02c07c25bbce42e345cb8b7aecdc74b4c7 SHA1 0b4d93abbd0956f3bbf0c47c12a4142be9c6e179 SHA256 6028751e470308b79e8c4099a59a67d21e80d99531e8fe79eceb2070ddc861e7
-DIST bitcoin-v0.6.0.8_rc2.tgz 1347644 RMD160 30062c007263119d0a84dc3d74b46917b2a62550 SHA1 8d4dc1ad739647669a83b0ef09d9480a1f5bd63a SHA256 593ec3370efab2d511ce6a5f21eadd70e1760dc53e8488c1ae9c9da10ee8bb69
-DIST bitcoin-v0.6.2.tgz 1359115 RMD160 855951bd6bdccb90bd584f9d17840be5a5f85c83 SHA1 7e35f5c5cc14a416c4ef5853e15583e644e64a2d SHA256 03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a
-EBUILD bitcoind-0.4.7_rc2.ebuild 2940 RMD160 f9b479dfc5e7e6cee7b3e783fb7c5d60e5f5f453 SHA1 a9f943943349a4690c4c1c3925af8df73207cab8 SHA256 50c0df32ca54b7c49da48bd17e15d709a258caddd967d4429d8c7cb17c7e853c
-EBUILD bitcoind-0.5.5.ebuild 3259 RMD160 fd02e93757382dbbefd442b2c1d36b47555aeb37 SHA1 47b035780737b0def882f4cb77cdf6ca6283c9a0 SHA256 0593e0497147bf4eea271a19b421600a03e0408980fea430ba5eb713739a3c78
+DIST bitcoin-v0.5.6_rc3.tgz 1063385 RMD160 f407ee77232a7adc373b714c5b7de5a47b813be8 SHA1 b98916fe980a0333a5316aed8ec91c1599ec80ac SHA256 f33ef4f145c676b990f2f2230f5f94258bb2b0e5ffa799b543fee104b59e4817
+DIST bitcoin-v0.6.0.9_rc1.tgz 1348909 RMD160 552fd11666ffe448b000a250e5b518f9627f5364 SHA1 e387a46932acf3178e0c1f01cadb3e2b749b7a6f SHA256 5658ed7aaded904f82a7d12460500f3e0d844b4206255c96cc067fc205f1cf73
+EBUILD bitcoind-0.4.7_rc3.ebuild 2940 RMD160 16f276d4ca5e1e22b48db2f8bc778b12f34aabdf SHA1 aecc1f6b98fd8792072d4e19d5aa8f4da5372c89 SHA256 ed5f9a3bce1c989d65df33bc503a32bb9c6e30b5a47df29722685e6a99514aac
 EBUILD bitcoind-0.5.6_rc2.ebuild 3261 RMD160 f80b252d9349fa581717b3fe8ba58374de3b27f8 SHA1 fba86dba0a0ce46091d9a91baafae57422c0899a SHA256 47b36083d8b7d4561368b827d7d142897d65fb5bb9a18675a7fcd73a31952034
-EBUILD bitcoind-0.6.0.7.ebuild 2894 RMD160 747ce98a9bb8b6bc9069947b2050fc1e10632910 SHA1 691a84700d87d4ac1707b4bc1981b156bfea99da SHA256 870fef6117f8166f2e9ac8871ab257096dd37900f9f97b2ac835ceab35a62b35
-EBUILD bitcoind-0.6.0.8_rc1.ebuild 2898 RMD160 2115d98a08dfe2c63f2410efe1902fe35c47e8bb SHA1 d82cee57e4fe1e93064c87bd44e64c5a1f8796ab SHA256 7aae6292ef6027af76f45af92f77e9a5ed3220c3526e8793778ab7f472e46ad6
-EBUILD bitcoind-0.6.0.8_rc2.ebuild 2900 RMD160 32b0024eb44c82612ec2266f9b5be3afff72464d SHA1 b228f231550626a12ce34ccf7ea537d7c49c66c3 SHA256 bc0abcb13ea2d086355bd2fe14d9ec9ea70eb5ac16b77f9866aefb1e7b07b787
-EBUILD bitcoind-0.6.2.ebuild 2857 RMD160 97ba9339ca311bff6ebc29625ed45a77e0b65fc8 SHA1 f2285ecae8da3ac252c91f4bb3ba7bb4e9ce9c1e SHA256 def248480f9bf22ba7378c07f22c884c2a858e31626b92c901c9995299ebdf44
-MISC ChangeLog 9027 RMD160 c4c8dbff4dcdb8482f711d0b5670abe122ef7ef1 SHA1 c3740489e56c5df614fc56de99de44eeb9053bad SHA256 8222547a0edbae9c654484c37427e24a0ee7fa0cc4bfcdc1d7c5c0f73a8ea15d
+EBUILD bitcoind-0.5.6_rc3.ebuild 3265 RMD160 35fa2b4d07a27d82127ddff089dbb64cee3566b9 SHA1 a248ca3891905f76217fa73475e19d2fff57a049 SHA256 08049ed9dd2dcc9c8f9c36b8437c804c426c54ee60a16d129d805526bb82ed75
+EBUILD bitcoind-0.6.0.9_rc1.ebuild 2913 RMD160 c061c82d51952a5c2e17a19f37cfda19b0169369 SHA1 97adeb6c1bc046d562903875464382be4c9743c9 SHA256 e3f8cd4a61dfbd2497a392ba4278d9aade83780df80bfcf8fd0e661e672c063b
+MISC ChangeLog 9655 RMD160 ddad3b4d85dfa4f4251d3234f590850153346a39 SHA1 f958da362aec353435e9f4b6367ed7a7d9f63a56 SHA256 934522e5847a1c9263b7fcd0d3addbc71287ef8974b8351a532c44bb5e860448
 MISC metadata.xml 683 RMD160 c2f0f1cb413e94cb491c4a6003153cbcc334a59c SHA1 f5bad1a7abe13b2b502eba4698ccd3a0fb95ff33 SHA256 e5bcb19c94ff112e277392fdd4eb09c75fc4199d027e2fe54df8c9ce8382c4b7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAk/pH6YACgkQl5yvQNBFVTXSWQCfUmtCFHWNQyL4aJ/yo/A7Qclq
+VacAn3754e2+bcw+gqTzaIi7ygcEB5Vj
+=eTX6
+-----END PGP SIGNATURE-----
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 \