Add new versions that fix CVE-2012-2459, bug #415973

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

10 files changed, 928 insertions, 5 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 9607c5f1604d..4a99ca6930c0 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.26 2012/04/27 09:27:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.27 2012/05/14 23:23:44 blueness Exp $
+
+*bitcoind-0.6.2 (14 May 2012)
+*bitcoind-0.6.0.8_rc1 (14 May 2012)
+*bitcoind-0.6.0.7 (14 May 2012)
+*bitcoind-0.5.6_rc1 (14 May 2012)
+*bitcoind-0.5.5 (14 May 2012)
+*bitcoind-0.4.7_rc1 (14 May 2012)
+*bitcoind-0.4.6 (14 May 2012)
+
+  14 May 2012; Anthony G. Basile <blueness@gentoo.org>
+  +files/0.6.1-reopen_log_file.patch, +bitcoind-0.4.6.ebuild,
+  +bitcoind-0.4.7_rc1.ebuild, +bitcoind-0.5.5.ebuild,
+  +bitcoind-0.5.6_rc1.ebuild, +bitcoind-0.6.0.7.ebuild,
+  +bitcoind-0.6.0.8_rc1.ebuild, +bitcoind-0.6.2.ebuild:
+  Add new versions that fix CVE-2012-2459, bug #415973
 
   27 Apr 2012; Anthony G. Basile <blueness@gentoo.org> bitcoind-0.6.0.ebuild:
   Add logrotation to 0.6.0 as well
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 5ae99e46d5d8..61b8d6f73631 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -6,6 +6,7 @@ AUX 0.4.4+bip16-eligius_sendfee.patch 7210 RMD160 0279ef9dc89044efb17aaf0693b66c
 AUX 0.4.5-reopen_log_file.patch 3140 RMD160 b6c535817ce3146af3e2a737e9defcf34ccf2458 SHA1 9a61bf4f1aeeb227610847584bb137cdfb5d174a SHA256 17d95c2492f5f860fd2ce01fe6bfa646afcc649b1e6c1af9b0a0fb7220b256de
 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.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
@@ -20,17 +21,27 @@ DIST 0.5.0.5-Minimal-support-for-validating-BIP16-pay-to-script-h.patch.xz 6940
 DIST 0.5.0.6rc1-eligius_sendfee.patch.xz 2532 RMD160 037893d15de2839de270189a6b2bf42136baecfc SHA1 7c935ba30972ec8248eedabf3d714e2c7ea1c56c SHA256 3bb8ce2945f359af329905d18747ffd934eaf5b68e080ef0d5f0236f2973111b
 DIST 0.5.2-eligius_sendfee.patch.xz 2408 RMD160 cc947fd2c62bb842438462dcea654e41e59d0fb5 SHA1 1b44c00615dbdf6775a1a33189715cd118a62f13 SHA256 23495db978f81dc8e029dc260933b6644a4de823734507adff9bcc3c8eef02f8
 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.4.tgz 904085 RMD160 3a00be1af20cad9c35740f47a7dd53f6ffb1b906 SHA1 0f328fba9aed9cffc48801b095046579fe60c271 SHA256 d9eda13a6346b629eb452516da247819725836ae5c6ad34174a7252ae9b8aefa
 DIST bitcoin-v0.4.5.tgz 1001767 RMD160 70e85b02788fe09094d4952d1557b43f74d76e85 SHA1 3b94c250611ecf6af3d65587af0766de3a2c4299 SHA256 0e52ee3cda1bb74ca6fc8cd93d73cef4fdf3ba034997544593f86e8057a92983
+DIST bitcoin-v0.4.6.tgz 1002459 RMD160 d485da48a7d1e030a4c4125f0e0e6997f7e77181 SHA1 1b8bb8dc80a6a71a8d8d91b1fb0262d5b225330c SHA256 6c2ba5b06beee53f6797edee6cd00ee8f34237ebd24393044d2e038edfa99367
+DIST bitcoin-v0.4.7_rc1.tgz 1002735 RMD160 a9313b5e65c61fde9c6478476c4cbe04b82bb45d SHA1 cc15e947d7073c4d01a2f3bccacaace0fb521f57 SHA256 d46efa7689a792632595ec7735638aff65f5cd275e894b9e08ea8122ac96305c
 DIST bitcoin-v0.5.0.4.tgz 902417 RMD160 774637dc953041913b114745436f66993b3736cc SHA1 daabee6998c8d2608bd7f0555891192738ad15be SHA256 48d3c98ba3d778438658528947089c46c12ef2d891b9d0412a1899b95f232331
 DIST bitcoin-v0.5.0.5.tgz 903160 RMD160 e6bcd69465b039d2bfa53a9d7356bb4cf1620eda SHA1 857b614594b767177c85e5fb6b8a48ba9b76bc95 SHA256 03781a554d9f514e6f07c59f87463b8a13d7c9f071efe80bd559ba47bc4c048c
 DIST bitcoin-v0.5.0.6.tgz 1001515 RMD160 17914287743704ddb6913888a340fe0898ce47df SHA1 782aeea4ff56b7d7addff6ca2644ff5a6e99d974 SHA256 3af52d8ce78d5bd711de7a698ec317581aadc257ff5c829cdca05ec9a5129d7b
 DIST bitcoin-v0.5.1.tgz 1007787 RMD160 107944a2f37cc0f873248ef8f2c23a602dfc2dd7 SHA1 27189303b71c6e9c5140c39659ea1f5280e8b4f0 SHA256 e33279066298e0a29e1dcca566d0a0bbcd89ef6e02d43bdbbeaf046f5faf66fe
 DIST bitcoin-v0.5.3.tgz 1012843 RMD160 92875b0073ada3771c79960c1a7aac3df511a49d SHA1 ac181eb976780f8af2ea5a3df2d9709accaa283f SHA256 0f39305d3da134a04c2509569f0c65dbe889aff9c91aef2deb3cfaa386094c0c
 DIST bitcoin-v0.5.4.tgz 1111855 RMD160 b7be91e9eb67509bcb827c8dcac13ddb461ce220 SHA1 4838f6500506e1fa0d8a9848414d6ee1f2644f23 SHA256 011d42ffb7bd20b350d5b11bb288c7db5c44d0bf78b90c0908e997073db25f4d
+DIST bitcoin-v0.5.5.tgz 1113196 RMD160 1562383a1666c67607c1875b6fd70fba6c6989df SHA1 8debef34ab09bb4d64d7d9e095dc5dba02679a5d SHA256 d1e9f6a9d75f4a8ba646bb77b3301b7179770a116093b8004b8e35412c616bc7
+DIST bitcoin-v0.5.6_rc1.tgz 1062326 RMD160 0ede1c3b94d28369519ae07c89487f182dbcd9d7 SHA1 0765129fb15a41fd6c7082baaf57913d21a3d8fb SHA256 076a894cf731c57c1ecf268900b057f135473b5cead12edb32c784c8cba92b2d
+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.tgz 1259313 RMD160 8173ae7ca66fddbd99edbcf3e860301bf9eb0a10 SHA1 6d4eafbb2d922a92fc0484f0bfbb48b8a4733ded SHA256 b57316e65b9f1f24616c6c10a023db6c1419a628c0e4cff7434de68c0befb861
+DIST bitcoin-v0.6.2.tgz 1359115 RMD160 855951bd6bdccb90bd584f9d17840be5a5f85c83 SHA1 7e35f5c5cc14a416c4ef5853e15583e644e64a2d SHA256 03c72d7bcdec70cb88033abb785b50686880b95d4768e8586891a9728d498c5a
 EBUILD bitcoind-0.4.4-r1.ebuild 2925 RMD160 0479d43ccd85c0c404813d9b3b5f17f259a6651c SHA1 6164fb1748e5b95020528a0a70c36c897d4d1491 SHA256 c16499fbade224715bc3827a10b33f53dbc596f0dd2802592643c9e492a0255c
 EBUILD bitcoind-0.4.5.ebuild 2938 RMD160 b22c88cfcad2a142c804be75918b8421eed960c2 SHA1 15629e79bb176104b5b0f5b0a02a6f6b0975a458 SHA256 7a78a407ba03c9180aaa90932aa7b6ad007ed7ecbd4c75df1a65005841fd57bd
+EBUILD bitcoind-0.4.6.ebuild 2936 RMD160 b027dbe17e38c447015dfba316f9235f55394ade SHA1 721d3d0759893f6df246bce15bafed37623bd95c SHA256 feb6453bec03304c04d8e4fbc5f4c31b77dadda3fdd6173bbab1e6bd682093ec
+EBUILD bitcoind-0.4.7_rc1.ebuild 2940 RMD160 8dc4c970a0c170488ac87ea50c44b2d79ac45eaf SHA1 f7ba6a95e82d9483892d68eb90e72e9ae2b7e45b SHA256 e20b6bc54173699bdbdef6b897602476e25604c293f43e658f6172e71106157c
 EBUILD bitcoind-0.5.0.4-r1.ebuild 3164 RMD160 21784b64ac09b7d64646b02e60974c0de14b78b5 SHA1 03641af097cbf3c80f4c77ce3dd7a9463de9155f SHA256 fe6a2a7648d8ce8242c947a9b2405ceccd3c01393a50dbbce69fe7676cfb0258
 EBUILD bitcoind-0.5.0.5-r1.ebuild 3154 RMD160 b24827745d36613d0ad0b5461747665b18775de8 SHA1 9d1851bf7445e8edcc80bc731930c459d87c85a7 SHA256 951cfb0488e864f13c2707935567eb03ae9a5541b1e4581d176c992979ffea31
 EBUILD bitcoind-0.5.0.6.ebuild 2950 RMD160 389ff21f6b6721df4156b8de51945cb88c48cfb4 SHA1 4327031b63ed691ca7d3743d7b9dbedcbac7adbc SHA256 78355fe954df4b91c169867b494127bb075efc9665fcd986126516d0432ee291
@@ -38,13 +49,18 @@ EBUILD bitcoind-0.5.1.ebuild 2415 RMD160 ddd00bfe3381d75865f6f4348ce7b9f01397ddf
 EBUILD bitcoind-0.5.3-r2.ebuild 3256 RMD160 2e76f9ec81f6412eba4c43e87f0b8ad4ef35c7e2 SHA1 8d34151542baa4742c183929a30807a30e6b0636 SHA256 d8c83c35d4fd795a37dca4736edd28f2e23fce9ef9a23e754037aa272fe14ce6
 EBUILD bitcoind-0.5.3.ebuild 2536 RMD160 16caed51a3bd162521955d9ffb936d310cefd5c6 SHA1 944f3921e5ae990de86cd4868de1cda0f5b5d6a9 SHA256 056f58b20e4c0e783bfce9a3aacad5872d60596321dcf3680d4ef6fb1a863bbc
 EBUILD bitcoind-0.5.4.ebuild 3265 RMD160 909e9d76b88dff814389346af3aebc31f9458a36 SHA1 a8214556c892e0a66c37eaa3092dc0e59405f86b SHA256 4ce75266b84d18abc2c97c318aa399b5e32d48834cdc54050649c26e35cc2ea7
+EBUILD bitcoind-0.5.5.ebuild 3265 RMD160 d7c0547269a1a46a77e4c5d82eba44ad2f4fa11f SHA1 6f1534b9c7d4a572ce28b130f5b1c81ad7cc9f44 SHA256 6cc49c2786e60534dc57e9f8376e1e3479ca2f283335eebccb4ce5fb4e8c1613
+EBUILD bitcoind-0.5.6_rc1.ebuild 3269 RMD160 0277997c4d5526f8b2d3edbe642e726ac821ccca SHA1 6284e78c759248afb4f97bb4bc0436ec5635529a SHA256 b6073fa9ccb94a588af8340fb665697255c2be1a86a1c6d4c52b9805328f5286
+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.ebuild 2883 RMD160 00c7e70ec7e788b76b5334297769c0cbbff25405 SHA1 cf1ad1b526cc12e6e52b2f4a0083ec6c8ab39a05 SHA256 09893c9481d7ba16b2fd367156ea5d816d29ff0ee0ea85eea06e1ae1b4d82953
-MISC ChangeLog 7075 RMD160 f65a0ccdd350b7683dca18b50d9e9d2440ad0588 SHA1 1c0f3f56424a7955521512b717857c3fe4af4e99 SHA256 0ad6c18ca2c3ae012184e7119dbe8c2a4ee4b2e55c0e63d30ae00914ff9a6fcf
+EBUILD bitcoind-0.6.2.ebuild 2857 RMD160 97ba9339ca311bff6ebc29625ed45a77e0b65fc8 SHA1 f2285ecae8da3ac252c91f4bb3ba7bb4e9ce9c1e SHA256 def248480f9bf22ba7378c07f22c884c2a858e31626b92c901c9995299ebdf44
+MISC ChangeLog 7641 RMD160 31a7491b5565f867406fb11fbccc62ab43371267 SHA1 da449b3ad783d725dbb220312126911ac0705b87 SHA256 4748f190355364c375491a50e0470576775e1541f93129ee798ef492bb326e86
 MISC metadata.xml 683 RMD160 c2f0f1cb413e94cb491c4a6003153cbcc334a59c SHA1 f5bad1a7abe13b2b502eba4698ccd3a0fb95ff33 SHA256 e5bcb19c94ff112e277392fdd4eb09c75fc4199d027e2fe54df8c9ce8382c4b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEAREIAAYFAk+aZnoACgkQl5yvQNBFVTVXagCYlIyimnuarCdkl6IIotbqHAbx
-ogCfcs12Mz4UrrEWrWR7sa84IqRCMwg=
-=VIfz
+iEYEAREIAAYFAk+xlBEACgkQl5yvQNBFVTVJPgCfRH7CBVEpESxikxyVfrhJ85ae
+dRsAoKBy6lEoqx7X8E6aQQH6Kca2vd0G
+=Vvb0
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoind/bitcoind-0.4.6.ebuild b/net-p2p/bitcoind/bitcoind-0.4.6.ebuild
new file mode 100644
index 000000000000..13fb1be806b4
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.4.6.ebuild
@@ -0,0 +1,108 @@
+# 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 $
+
+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.7_rc1.ebuild b/net-p2p/bitcoind/bitcoind-0.4.7_rc1.ebuild
new file mode 100644
index 000000000000..4425db4208d5
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.4.7_rc1.ebuild
@@ -0,0 +1,108 @@
+# 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.5.5.ebuild b/net-p2p/bitcoind/bitcoind-0.5.5.ebuild
new file mode 100644
index 000000000000..d8e7c95342bc
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.5.5.ebuild
@@ -0,0 +1,122 @@
+# 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.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
+	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.0.5-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 )
+	)
+"
+
+LICENSE="MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bip16 +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
+	if use bip16; then
+		epatch "${WORKDIR}/0.5.0.5-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"
+}
+
+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.5.6_rc1.ebuild b/net-p2p/bitcoind/bitcoind-0.5.6_rc1.ebuild
new file mode 100644
index 000000000000..07b720c49bef
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.5.6_rc1.ebuild
@@ -0,0 +1,122 @@
+# 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 $
+
+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
+	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.0.5-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 )
+	)
+"
+
+LICENSE="MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bip16 +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
+	if use bip16; then
+		epatch "${WORKDIR}/0.5.0.5-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"
+}
+
+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.7.ebuild b/net-p2p/bitcoind/bitcoind-0.6.0.7.ebuild
new file mode 100644
index 000000000000..773d8ab3196c
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.6.0.7.ebuild
@@ -0,0 +1,114 @@
+# 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
new file mode 100644
index 000000000000..5c83d08e0e39
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.6.0.8_rc1.ebuild
@@ -0,0 +1,114 @@
+# 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.2.ebuild b/net-p2p/bitcoind/bitcoind-0.6.2.ebuild
new file mode 100644
index 000000000000..bebdbede9756
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.6.2.ebuild
@@ -0,0 +1,113 @@
+# 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.6.1-reopen_log_file.patch b/net-p2p/bitcoind/files/0.6.1-reopen_log_file.patch
new file mode 100644
index 000000000000..d4a43f907f5f
--- /dev/null
+++ b/net-p2p/bitcoind/files/0.6.1-reopen_log_file.patch
@@ -0,0 +1,91 @@
+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();