Version bumps using bitcoincore.eclass

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

16 files changed, 597 insertions, 189 deletions

diff --git a/net-p2p/bitcoin-cli/ChangeLog b/net-p2p/bitcoin-cli/ChangeLog
index 32c7b90ad770..0b1bd7ab5e95 100644
--- a/net-p2p/bitcoin-cli/ChangeLog
+++ b/net-p2p/bitcoin-cli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/bitcoin-cli
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/ChangeLog,v 1.4 2014/11/21 23:31:20 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/ChangeLog,v 1.5 2015/02/23 21:36:41 blueness Exp $
+
+*bitcoin-cli-0.10.0 (23 Feb 2015)
+
+  23 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +bitcoin-cli-0.10.0.ebuild, bitcoin-cli-9999.ebuild:
+  Version bumps using bitcoincore.eclass
 
   21 Nov 2014; Anthony G. Basile <blueness@gentoo.org> bitcoin-cli-9999.ebuild:
   Update 9999
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 18a375c44a79..16ddb9b024c5 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,26 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST bitcoin-0.10.0.ljr20150220.patches.tar.xz 34536 SHA256 cac6b61e34f1903d369568895072b7c31e4aed2cceae4c25c1e5b80150c92494 SHA512 08913029dcbf9b43fafbc76525061c18d4e033ac1e88b781301064a35d2f099b4de83e4e964197361657a8c0de49ad463d7004c6af485c09df3589a75928ef19 WHIRLPOOL 0032fc98e947b68c37350b2defc7b2cc160570078bcd8bf0d0e4c435dec16f9bc3149a1117acc7998862bf0206fdbc3752e2b426fe1d51eb4bcb4942bf67b77d
 DIST bitcoin-0.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a
+DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438f01c6c45f0ce3aabf9bd428 SHA512 cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66 WHIRLPOOL 6ce18de9a2b24cedd88e110088d0747452f8403b6239df9212b673e4a893e059bdea2640b13b6fde659a866d4a6a3b4fa62dde3adbf957b80104d41c0e4aeb18
+EBUILD bitcoin-cli-0.10.0.ebuild 691 SHA256 3d8846b14308badf9325b9cd377e70cc1947d339b01fb63bc33ec066ed09e940 SHA512 2b332cf7c0b8b7907d736d3db2917fb1bc1a7338a1acd5c96bd00f4aa8b29c8a89a69bbd30cf615c1d89eee11f79ee724dad4f1120a9d21c78a2579240a04805 WHIRLPOOL 56bc3cb20f213770cd988a41e24f8c587a1a14d859c98b0ff66999c27f07051450e78aa41949368ebf925f530728e58ec3ac343d54dbf873dd81e763f2a4366a
 EBUILD bitcoin-cli-0.9.3.ebuild 1264 SHA256 6e20c5851314821dba45fcaaf62e8f68b477b014fa2c96f63d0a37ddd26ef50e SHA512 674e4497d128056b9c91cd4be303c717b305097f9ad4088f9f3da52f1f2e88f7e3ad20fae7bb8de2028a68e38be7ddad399bca613df8fad0ff1fbc1642143e99 WHIRLPOOL a2bac7adb5867cd028d4579a2f36debc297371c19d72a318223a0e54976776e6f48e35b37157b5c299c34b93dc026090c803137508ed8c0ecad6ec3c504d85c8
-EBUILD bitcoin-cli-9999.ebuild 1113 SHA256 13ad277c9fc646f8aeadb190858d53771cc950fdebaf1babffb16e67e98b89b2 SHA512 25a344f0e5bdb9a5bf6cb6428c714235884ac44e4afc81df1b61394c65145f640fe64f2fe6b5faaf2402d82fc82f5554fcb62c30b3d30c2ae2824335627ff7f4 WHIRLPOOL f9168fd9a3bb9cd147a8e916c4d642fe6f6b1bf59a54fedbd9337c03d400968e1fe1ad1bfe6af86915bc0e4837e3bf3dd17520226d18fb2ae5ad1e5d174c8508
-MISC ChangeLog 580 SHA256 b8e5e6830b169e371c1585b36e0190cf29bf2501f02bd9bd9a56c669c24a541a SHA512 7fe551eec2e1ef2db26d69941f5bc4b16b0957142dc266e063f53edcc4c1351f3c82691ecf013ef97d279303bccaf2f8c35adb7103989ed0ab094ac7d94f8ed3 WHIRLPOOL 382532ae503b910aef3c1dfad87db3c9c744b57ffe15149c9613751077e102ffd051946d4bd1da543f7c101d73c5f3d44d21c03c8f159d1724796dae1229758c
+EBUILD bitcoin-cli-9999.ebuild 636 SHA256 046ecd49198e63fa9b840362803ff7f2281ffb354934f49bf110d808970727d8 SHA512 8b9440e911de03d242fb883e39c60f6c528109be83e9ad4b4f22c7473819d6d6a75409cbeb74e7c8fdc192e7f321a4a77653e7319ecb42b8192efe49aa4a2b14 WHIRLPOOL a3ae5829ecce38155df92c40c2c2fe9cfb7ec1c4fcc1cfcadaf3ca1ee54a756f66b643faceace453b20493aab22c103456d881fef58c07d95193811b265bda5a
+MISC ChangeLog 767 SHA256 14fc3e5983caef53a2b32479093f3a2ec61890e518dab0c0940a2b0b1d186c66 SHA512 fab881e835405a0ffa1b677812d7f17d69b817dc093ff19cefb5d55ae6e903b2cec01ca3ef96d2039419b96ca0444d81337ae4e7e326cd228193ec50f1e4d08e WHIRLPOOL b109648b9215b2dd487df1d34b792084f3a26db07d07d065a2ba9c04a276fc89229f1b86f01009694981f7dc98d86938984f2dff3c42f53270559ee184f768d2
 MISC metadata.xml 374 SHA256 5098edf30adee84f59968d5b6c45adcfa410a32001905dea9c093a5ce74a44b3 SHA512 4315e762ca8061694dd652ddcd1a9f9f4b51a06126207c644a52557fb977b94eda2bea826f326763f99cd7da5e813fd07251d039bece31fc13f8686d7113cea2 WHIRLPOOL a629000079acf2866848adb5f66496970dc515badbd9e624437ea89d06d7a7f106ac50a22eeefaac28012667f86d5938c8e4ebba3df837c70763b93e3e239b6e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUb8vvAAoJEJOE+m71LUu6gngP/Awval9tn0Ta+kpCQCHF232p
-kSBODSa+mFlfxP9mOEmHR8cdXFe6Doc9IZb4twH6ohHMoxOW5CdiSkTh7FmcE3GA
-7H66sONf/Jj/ePeiaLL8LNBKMqe6Z8qNCd40q0H/HNJWM3DgkmFg7M239duYSO4m
-5oKbcMytrCTrgm2sohEtIm/7hCkgwBVZ+DelfBHxBecVM0vysPEwdRfvfj8Vyprt
-BUgse4zLo8cSRF1k5Q/cQdyBnm+prZKl4GNItAGOjTqvXMopATsekBH03fa4gkwY
-muVeXRVeyVdOjTDQoeaGcPMztAP6tZ9ANiA1TEwMRDoMoSIfEuH9BNVeu2bovrEJ
-5W4H4DaLv6NgoU6eMkOCwP037rtrStcaI84KcMlwMRTDow7fNXBvqfL73gHtZS9W
-5wpxNnajkpHkMbLqlC409h982YOObjiOiQzbiEEN1IVkzP79T9h0GBGFCwYWOt6l
-OjiuFkNvvsOe7aYGv+Cvdq4pd6ZOWCTihaDRkg4Li3DTDPsKxBhB5RkBC7x1CZUS
-9cOE5EWtzEXPGvCahaLhcRlhvsYDDcPiAqEyF1aglamtkQJ3nKswPraHL1lHOl2O
-PoP/ZogetYmL4yJnwIeQJsv+fLpWCsVPDZJVz7SMhm3rYOfTjiIS8FFRzPvNXyGu
-5JJyhPr5GjoLq4jubK48
-=QHWR
+iQIcBAEBCAAGBQJU653XAAoJEJOE+m71LUu6JHkP/0Q5UxktDErf60e+MVUrvbuL
+fjh6KMbSvFmiqzKYRP9JWiccoDcdtS2uX1EPVHp0tK1xjP/aNclUeV94UHn5tRjw
+4MShHI/xXWkpYUgIaA33q1LMXfS6MKEDPXM4w5GXezjfQ44yf6UY8ogbu79Ab06C
+GNhraXP67y7ajMSrUIn8HAvUhgQkB3Ig8byPzpNr7UY0irMmmFhjfxx7btLmogXp
+7uwtTfdvMvRgdYcCy7A0hR7DCvUZoPDNd0jDnickR2wh9ei25y0crLL2guATa6jW
+U/OJHSVleb76RJLLHtrCVsRv15Og4/Ro0SL4gHxPU5mv6WA+1ibUdTFy5JevJRqG
+zmMfqRZV0o7O3F0GVee9DECAAEfV3CHYUbSnUMn/T6sqvR1AoV3Vx++vJPS8kne7
+Urbm7+xmrAEqHaBM4GQaKklTVwa76Me0VjjmWzNoFULiznpyNzD0Gk3QARdyG2d5
+OP/1t1tFofuHp1zc2Ob3CcHU0u47eKlnldzdSSbkPs811FsL9dLT7lGTxBkKOuiV
+9d0w5NcVuxgWN3W5eZFmMLybnYqv1KgZIMzikhFdYv/DEgj2DrzymSyJuiBu/UiX
+iYU7TbFfjLEIDcvpw7sb3mFdkbVF1k1qIVWcpUg0Bpa3rwH8NfZC1zfFAOQJ+wsR
+JYd2Kzdo7W0IUX19lrhT
+=IwNX
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.10.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.10.0.ebuild
new file mode 100644
index 000000000000..980f3902e676
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/bitcoin-cli-0.10.0.ebuild,v 1.1 2015/02/23 21:36:41 blueness Exp $
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
+BITCOINCORE_LJR_DATE="20150220"
+BITCOINCORE_IUSE=""
+inherit bitcoincore
+
+DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	virtual/bitcoin-leveldb
+"
+
+src_prepare() {
+	bitcoincore_prepare
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	bitcoincore_conf \
+		--enable-util-cli
+}
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
index abf304dcbacc..a91faebea936 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild
@@ -1,52 +1,29 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild,v 1.2 2014/11/21 23:31:20 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-cli/bitcoin-cli-9999.ebuild,v 1.3 2015/02/23 21:36:41 blueness Exp $
 
-EAPI=4
+EAPI=5
 
-inherit autotools eutils git-2
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
+BITCOINCORE_NO_SYSLIBS=1
+BITCOINCORE_IUSE=""
+inherit bitcoincore
 
 DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="
-"
-EGIT_PROJECT='bitcoin'
-EGIT_REPO_URI="git://github.com/bitcoin/bitcoin.git https://github.com/bitcoin/bitcoin.git"
-
-LICENSE="MIT ISC"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
 RDEPEND="
-	>=dev-libs/boost-1.52.0[threads(+)]
-	dev-libs/openssl:0[-bindist]
+	virtual/bitcoin-leveldb
 "
-DEPEND="${RDEPEND}"
 
 src_prepare() {
+	bitcoincore_prepare
 	sed -i 's/bitcoin-tx//' src/Makefile.am
-	eautoreconf
+	bitcoincore_autoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-ccache \
-		--without-miniupnpc  \
-		--disable-tests  \
-		--disable-wallet  \
-		--without-daemon  \
-		--without-libs \
-		--without-gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/README.md doc/release-notes.md
-	dodoc doc/assets-attribution.md doc/tor.md
+	bitcoincore_conf \
+		--with-utils
 }
diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index bec4fae7e097..0c8ebc4dabd8 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.93 2015/01/28 18:46:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.94 2015/02/23 21:28:13 blueness Exp $
+
+*bitcoin-qt-0.9.4 (23 Feb 2015)
+*bitcoin-qt-0.10.0 (23 Feb 2015)
+
+  23 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +bitcoin-qt-0.10.0.ebuild, +bitcoin-qt-0.9.4.ebuild, bitcoin-qt-9999.ebuild,
+  metadata.xml:
+  Version bumps using bitcoincore.eclass
 
   28 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
   bitcoin-qt-0.8.6-r1.ebuild, bitcoin-qt-0.9.3-r1.ebuild,
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 7b143cd3ee17..1a582c25b850 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -8,28 +8,35 @@ AUX 0.9.0-sys_leveldb.patch 1040 SHA256 1355674ba82966b31fd001b12e7bd1bffbfd7f1c
 AUX 0.9.x-ljr_noblacklist.patch 330 SHA256 b20c934540748cd42405bfca305a61bf05a76cd9b54f20e57e5fba84bb742f6a SHA512 13e727d6e1324542f7097c310e2f2a869d39acf6288593661b81715858ee95d1ca0566aa9892e5a8e34e4c45edc28faff6938728f1b97e9561460ea99838834a WHIRLPOOL 851fe606c02da5d8f778d56aea83d5a55a427c7a83610755cdd35fdc67a02a4628c1c480bea5d8d862968416ff3cb3e78d56ece498055f86e4d138e5997db674
 AUX 9999-sys_libsecp256k1.patch 2804 SHA256 ddeb293959184d82beed8bf9117916a28d49c0d0a324287ea026bdcaa7505871 SHA512 970a851f564cddf5ca2ad453ce6ba767b3815be9bcc4dd09c5fba6f42e1b70a9de7438d31e8dcf15875cb4c06ff2f04b0a2361b6b413b2146b2c2c78b908ea17 WHIRLPOOL 634cb832458551b61caf8d852335260ce4f2253a516dddc8b723ce89be05fd4254f4f6b49f8c6697da4120e723a068308d0cdfb57c16c199329cceb83a9be2b1
 DIST 0.8.2-1stclassmsg.patch.xz 1788 SHA256 ae871cbd949abb6c6c57eade016b2945ea95672958362439db76697aa23400af SHA512 b511c0dac07710497d0d2aa814049b72db1186a5f86f2b7837e7927989be75319a83eb10dd37fbf4f5aba7c4266f7a35d0b9abb24384df2f93e1cd8090bd7a55 WHIRLPOOL e7a05cda0ee01bce08ce5a17c8b72f6b9f1636c916f38e03cb0a2604094959f44c58e54c35be6aefddc81e91f1e6b416d23480a8ac0e34a186b80ce349cebaa5
+DIST bitcoin-0.10.0.ljr20150220.patches.tar.xz 34536 SHA256 cac6b61e34f1903d369568895072b7c31e4aed2cceae4c25c1e5b80150c92494 SHA512 08913029dcbf9b43fafbc76525061c18d4e033ac1e88b781301064a35d2f099b4de83e4e964197361657a8c0de49ad463d7004c6af485c09df3589a75928ef19 WHIRLPOOL 0032fc98e947b68c37350b2defc7b2cc160570078bcd8bf0d0e4c435dec16f9bc3149a1117acc7998862bf0206fdbc3752e2b426fe1d51eb4bcb4942bf67b77d
 DIST bitcoin-0.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a
+DIST bitcoin-rbf-v0.10.0.patch 22353 SHA256 3e3be932da3785e440a89e2c7779a86a7414c8966b8625a177c421cf2f77bc14 SHA512 234b57b174b1583e3eed11938a38c4b02f8031431d7d27db3adce87ab2c22d7f6b04ca25ac2fafa76da2aa2c549733190dcaca30a9bbc998c61d26374f5075ef WHIRLPOOL 3d95a63c5fd823fda3752c0c41e7ffc51b7db14cba3a6610a2ebcc2ddca54d907421695932d49823ac38e1e6227a3ccab685470c829997ccdb1173751ba327c5
+DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.8.6.tgz 3194026 SHA256 26fd485823ee15a823ca51a5ac7ed8664079ef15356a030e74a01f1a7a157170 SHA512 88e1d5dece485beaa95571016f41239db616323508038ea59d0fa3608639c03af06c0d782df3bf5a67d45d25c976bc07b977504ca6390e147e3b8605f3d3ce86 WHIRLPOOL 86a5118dda3f68226d30794bc1b363a75479fd55648146e4347017416d730c23ef4168553a5e70d95466157bf89055def81647790fe414d6182c1baf3e397344
 DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438f01c6c45f0ce3aabf9bd428 SHA512 cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66 WHIRLPOOL 6ce18de9a2b24cedd88e110088d0747452f8403b6239df9212b673e4a893e059bdea2640b13b6fde659a866d4a6a3b4fa62dde3adbf957b80104d41c0e4aeb18
+DIST bitcoin-v0.9.4.tgz 4885466 SHA256 e7d17bd33a51a755b2d23f3bd9f384a272d87a234d02789056b2e4b8a8a92ca1 SHA512 6f13b3adf8791458e8eb7c1e62cbb2277f2caeb36c21cf0d783db15473cb0f29047bc3939c529ce893437aaf3eac0e7af2b161bd82381434a16474611136de06 WHIRLPOOL a65841ef1bf44066ed7548f81c5efaf59bb1adb99a698bd2e9910e09c395518218d8443180fcd0f63c7c938e9852c36a27b5f021b128e8c4973ec427fe0995ed
+DIST bitcoinxt-v0.10.0.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
+EBUILD bitcoin-qt-0.10.0.ebuild 2857 SHA256 5a90ea18ce1199f273cb7d563344feea64647b6adbc0cec0fb470f135ff3bbc7 SHA512 7e50006aa3d228a4abbe36f48743bdf2f08a72eb51b9a25ef12e78969a7c7377844e2b114c6933d168471030b2c2e32a5b8126bdac3606a4f3570708d13eb79f WHIRLPOOL 673022f29cd9e0f281e144379c380864e727c197104de417c9ee687e9597edfdd71b383d07614fced71217a77e3650418ec4f15cef16b603325f2f3b4e93f0d5
 EBUILD bitcoin-qt-0.8.6-r1.ebuild 3493 SHA256 4643ae29b4964fa112b59d26248a0d654b96dbce2fbac35e67209f5caf8968af SHA512 8d7eb8ce1dde933c7d33a96d3176a361dff659ac94bc933f8e37348442fa20aa96002700a595777db0e438a887e226c2d2316211368022ad27f0d037f780e021 WHIRLPOOL d6e18fc3b8e06f7454a8d9e299153e998b6b88c16281fdf057ce513dbf23c49f57c4d5d44abc543e110ddc2caf3d9915ca3b9c4b7f8bfddec0a9591215473410
 EBUILD bitcoin-qt-0.9.3-r1.ebuild 3614 SHA256 224b1c75c7b8c83c446a97b3ffef001bceefc7d60d6ff62ae71ef4e90004c000 SHA512 68dc467711679f30dfea2e95fa4a504f59b1877fe28bdbb929fbd281fa83814deb62541a3a83197b05c2089ca90ac1b5026c4c7f7fdff8bc37bb8345c4f76506 WHIRLPOOL efde5bc68dbc7906d4ed94b61fb0558cfa715e4b95f4e00ea668116fcdeab3e9a83e9298a0866470a447e3069cf022a6f1d8d78c84371460509ebc5040909fc3
-EBUILD bitcoin-qt-9999.ebuild 3262 SHA256 05c5efbc2c27fdd88fa3e85b1a6d0d7c485aadd4fc0dc6f648704d48cc6831d2 SHA512 4bdf5c2856bca3162f7c08f9e63fef07ee998be446be8ae55e43da90ec2585a121c7bf1ad74e671c607628638ebbe6c86773a48296a21aee211ff85c546b3375 WHIRLPOOL 81ba942e8af093398852c03c4c97c60d12fa322d27f4b9af724950ebcf8a98808df52779c59cdde19021a091f83809e443064d6fb86f0098797bd3fb7745d35c
-MISC ChangeLog 19441 SHA256 9b6fe5dd2e2472b67480d9e5ab96a17db6b29e9182229f8433e4d2eb298cd222 SHA512 da0d4ed66964b734f9b2f03d39cf5075a160478768f8cd6dd7c38a59d442d049743297dee6b5a5afc8546248574fd1159cd245a737e068e3679a3b02f7353bf3 WHIRLPOOL 25a0ec6fb44f796363b6e23e2a1ed59cc64be70d59ef6b8ca77a666ee68f4d5402f6e3bc35aa4d346740b968177fa8bcfb7aa2fda44b496fd814d9181d51078e
-MISC metadata.xml 683 SHA256 7646cc2d572e809bfa417fd1ff3cd6132e242684890cd12839d30c7ccd58093c SHA512 5e5678aea84a43f45994a3d4ccfa82990df66dc6f7d752642090dd70b2e8bea79eb0d08bf2c1e0017827d1515763fbd1365c2a332fbd033c983d143c38f52453 WHIRLPOOL 0f0456674533817da48c3bfafb23e3b2ecb9fe0679ed0d6cad10db38b01474a08134542d743877e3b10b4979b853775eafdf98b1cc16b1cb0f8f89e8d48b496c
+EBUILD bitcoin-qt-0.9.4.ebuild 3566 SHA256 f46d191b74f895eb6bbdd4eeb61a2e27f6861e51b14e265946c53d27a9ac03f3 SHA512 acf56f270856168739b216d84535f29b478dbfe7070d98f9c9f8728ea94217c1612061f948becf05e1f68b31c8a781ed5a638290b4e9bf7e0ff40edfd1178323 WHIRLPOOL 9c3288bcadb532aa22a34f981f1a992040db207432fc39e42e8988f9f1c90b7a46f67c0d72becdaece2cbd9cd3ad7dd6f814f6a60816c91fce44b810b88a54d7
+EBUILD bitcoin-qt-9999.ebuild 2463 SHA256 8f14003aeb433875b2c7a91364276299fbd840cbb9a5c994de463e90026fa2b7 SHA512 dcef5715bae7e609922788c1280de0cbc67335780462759c34aa4b6fdc10bf32e5f6f64b8b72a51df8a8ffc3ceb6da30f91e0f63b06ec7fce332c197e2b99cdb WHIRLPOOL def48f2842e93e200643fe08ef3575d1301b927bf2b80f86219f76306f4194afe3f2383fd802301f9d962b6d634051caa866b5f838710ee2dda729ae35903027
+MISC ChangeLog 19699 SHA256 b0f49bff3382292965e0e58f315c5bbbc950ee3e759600644557ff97c0f7139c SHA512 61941fe6d56efeb56b762a02da93543b595ae24489549fb22e715e7458eb8752b5b935e9e26e8fd81ffc880b520c6a802054c3bfc153386a076eaf9b9f4e8c13 WHIRLPOOL fbbf37f26b9230fe2bdc4b80d69acbe142119dcabc36736b9cebde5be9d8d44f3d7de7eb06c0fb03d794e1353b8d6a8d0a226c94d9278c4babb954e0a33e9617
+MISC metadata.xml 1556 SHA256 f5b8c1e0e2cfbefc6b70785434a95d5509a1335935cb5e675537eab0f54be6da SHA512 c6ae1e639e1c4f82cafa6193615c8b641d5926dc9cad712e3fc98dc20eba68e8700b6d4a587c00275a422cf31516f74e5c1bfbbdef41960b7784e2b46a22edf7 WHIRLPOOL a30463812581ebb11fc17d531c5de5d29f5e8a9997606e06a6965227ea0d4be1e38c3a7ad6bb3adfa83cf49f87605639307e6c2cac60b001d034d953cc7aa98e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUyS8TAAoJEJOE+m71LUu69f0QAK2ssKG0XlIuoeAk5Fu0TFuw
-uCq6H6KkKDHWbXnn2yUqS5GKsIpV9iSBa0wRCQAmaZtXsyFwf2v/xxad0E8o8hm2
-rHfWdA7aJqnvyzOIyv05GJF+nuF/i+uPxRV30v8sVVeaCgMoUaMvhd+8YwRhk9Da
-uF/hgql1gkKctk0QmWdS/KNCZ0bzKh+3bM0jrQ5RBEbQy22AcLfQW70B6wfmctan
-8end4TzSas5u47rk78YTDDFhP5V/Kcxxmk2rIL0gFC+H9nuV7uiG2CZPaHkYI0ki
-li3M26fmCf/5LJSkomd2A6TfDMAhV2IjfrMzs6xOSg+Bk0T7TKd7uVjnR88cO/ot
-83n8vCsq9gUinks+BxQyWfb3/K4GUJXgM3cMi4WqRl4qVvjHaUJQAcoA108yXOan
-Vk56X9Q5VXR04qqFRulymhe5Z2m12w2y80E0/+Ww8vJChSwfwuj2bvGG8kXoB93Z
-kpwNMRoXNo7IwbBF0zBVaXwm8r17DEenFvuTjM5vwkd5emG11KdQQO2Fdql/6y6C
-6JVvTGIiQJ5km7ovJVjcAIyjl4N3DgdYmZ7V3PCo0HLkqaijXuNIoPEE8OcLXO75
-0LLywEADTUG68BzAY9Bx1oPivx6Yxb0MbbYgXK18ZYw/rwq0oEcrsyB0e1CgMBPX
-aC+63KO118Nqn/3Qf7wc
-=0kIa
+iQIcBAEBCAAGBQJU65vaAAoJEJOE+m71LUu6E34P/j4NEp+pIWFMhi2uWN3ZL7lq
+4KygfjMYBepAZOjUvYgk7M6mqxM3HoTLDjj3VASEssGRVqvA4SlX66r/uO4HbmLj
+kjxTGiOTyvdfCu+TX4dYUg4/xI0kJyTjmsRxsw7anFX6HuALvUoCdEby0vZIBt+P
+mFuf4+mZKMfA/c//Om6a/qWnE55kgfbCnvWjml/fL7n7N3euaFUu87twyzqRKaRF
+d+rQ7yK5Vf2BbHLM4C35GqPyrkhA2Yyun9toHs/J4+4p4b56ZuipT02OkVunuGeA
+IpAPtL6lZSW4NNKFGOv5Ti86Og+g7pDsK4cjBAEsgQ+3/KL69cDtA9fp4JMqcPbc
+Emjp39o22cJesr9/Z+N3+fZz7M76MvBvCDHINogHYg3zFR4I6A4EK0kO1ZXlHdiu
+xKFpuX+fcfQSTprnctPmlICZcF4lDVTh+MHAa7kNeLoEH1rGHpsuL+iDytxNIrd2
+iBXJbL+NYyYYG+BjIAfE3qJE6EctPYhqdxVP97eILBSytqhODCy/git5oSG8mblt
+xn+peY189K+mtk2tNNx36O6qiI+9omVXuUayWNLCbsfhBSC2YP+LkrfMpYFfd8yH
+hPjTxd8vgJB53sUa58zJs07acbIPn0VN6bNAoqK83JCnuONaUAUEO1n8UGO09fM1
+PqEfK02zzMV2vQb9VdOG
+=DmPz
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild
new file mode 100644
index 000000000000..0da1c06e6e31
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild,v 1.1 2015/02/23 21:28:13 blueness Exp $
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
+BITCOINCORE_LJR_DATE="20150220"
+BITCOINCORE_IUSE="1stclassmsg dbus kde +ljr +qrcode qt4 qt5 test upnp +wallet xt zeromq"
+BITCOINCORE_POLICY_PATCHES="+cpfp +dcmp rbf +spamfilter"
+LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
+inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+LICENSE="MIT GPL-3 LGPL-2.1 || ( CC-BY-SA-3.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	virtual/bitcoin-leveldb
+	dev-libs/protobuf
+	qrcode? (
+		media-gfx/qrencode
+	)
+	qt4? ( dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtgui:5 )
+	dbus? (
+		qt4? ( dev-qt/qtdbus:4 )
+		qt5? ( dev-qt/qtdbus:5 )
+	)
+"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
+
+src_prepare() {
+	bitcoincore_prepare
+
+	local filt= yeslang= nolang=
+
+	for lan in $LANGS; do
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			ewarn "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in $(ls src/qt/locale/*.ts)
+	do
+		x="${ts/*bitcoin_/}"
+		x="${x/.ts/}"
+		if ! use "linguas_$x"; then
+			nolang="$nolang $x"
+			rm "$ts"
+			filt="$filt\\|$x"
+		else
+			yeslang="$yeslang $x"
+		fi
+	done
+	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
+		$(use_with dbus qtdbus)  \
+		$(use_with qrcode qrencode)  \
+		$(usex 1stclassmsg --enable-first-class-messaging)  \
+		--with-gui=$(usex qt5 qt5 qt4)
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	insinto /usr/share/pixmaps
+	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
+
+	dodoc doc/assets-attribution.md doc/tor.md
+	doman contrib/debian/manpages/bitcoin-qt.1
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	buildsycoca
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild
new file mode 100644
index 000000000000..05941b83263d
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild,v 1.1 2015/02/23 21:28:13 blueness Exp $
+
+EAPI=4
+
+DB_VER="4.8"
+
+LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
+inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2 user versionator
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+LJR_PV="0.9.3.ljr20141002"
+LJR_PATCH="bitcoin-${LJR_PV}.patch"
+
+DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v${PV}.tgz
+	ljr? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/luke-jr/0.9.x/${LJR_PV}/${LJR_PATCH}.xz )
+"
+
+LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="$IUSE 1stclassmsg dbus kde ljr ljr-antispam +qrcode test upnp"
+
+REQUIRED_USE="
+	1stclassmsg? ( ljr )
+	ljr-antispam? ( ljr )
+"
+RDEPEND="
+	>=dev-libs/boost-1.41.0[threads(+)]
+	dev-libs/openssl:0[-bindist]
+	dev-libs/protobuf
+	qrcode? (
+		media-gfx/qrencode
+	)
+	upnp? (
+		net-libs/miniupnpc
+	)
+	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+	virtual/bitcoin-leveldb
+	dev-qt/qtgui:4
+	dbus? (
+		dev-qt/qtdbus:4
+	)
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+"
+
+S="${WORKDIR}/${MyP}"
+
+src_prepare() {
+	if use ljr; then
+		epatch "${WORKDIR}/${LJR_PATCH}"
+		use ljr-antispam || epatch "${FILESDIR}/0.9.x-ljr_noblacklist.patch"
+	else
+		epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
+	fi
+	rm -r src/leveldb
+
+	local filt= yeslang= nolang=
+
+	for lan in $LANGS; do
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			ewarn "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in $(ls src/qt/locale/*.ts)
+	do
+		x="${ts/*bitcoin_/}"
+		x="${x/.ts/}"
+		if ! use "linguas_$x"; then
+			nolang="$nolang $x"
+			rm "$ts"
+			filt="$filt\\|$x"
+		else
+			yeslang="$yeslang $x"
+		fi
+	done
+	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/qt/Makefile.am'
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-ccache \
+		$(use_with dbus qtdbus)  \
+		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
+		$(use_with qrcode qrencode)  \
+		$(use_enable test tests)  \
+		$(usex ljr $(use_enable 1stclassmsg first-class-messaging))  \
+		--with-system-leveldb  \
+		--without-cli --without-daemon \
+		--with-gui
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /usr/share/pixmaps
+	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
+
+	dodoc doc/README.md doc/release-notes.md
+	dodoc doc/assets-attribution.md doc/tor.md
+	doman contrib/debian/manpages/bitcoin-qt.1
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	buildsycoca
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
index e2749533c1ee..2fd70a24e485 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
@@ -1,56 +1,33 @@
 # Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild,v 1.3 2015/01/28 18:46:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild,v 1.4 2015/02/23 21:28:13 blueness Exp $
 
 EAPI=5
 
-DB_VER="4.8"
-
 LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
-inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2 git-2 user versionator
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="
-"
-EGIT_PROJECT='bitcoin'
-EGIT_REPO_URI="git://github.com/bitcoin/bitcoin.git https://github.com/bitcoin/bitcoin.git"
+BITCOINCORE_IUSE="dbus kde +qrcode test upnp +wallet"
+inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2 git-2
 
-LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )"
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+LICENSE="MIT GPL-3 LGPL-2.1 || ( CC-BY-SA-3.0 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="$IUSE dbus kde +qrcode test upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.52.0[threads(+)]
-	dev-libs/openssl:0[-bindist]
+	virtual/bitcoin-leveldb
 	dev-libs/protobuf
 	qrcode? (
 		media-gfx/qrencode
 	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	virtual/bitcoin-leveldb
-	dev-libs/libsecp256k1
 	dev-qt/qtgui:4
 	dbus? (
 		dev-qt/qtdbus:4
 	)
 "
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
-	epatch "${FILESDIR}/${PV}-sys_libsecp256k1.patch"
-	rm -r src/leveldb src/secp256k1
+	bitcoincore_prepare
 
 	local filt= yeslang= nolang=
 
@@ -77,36 +54,24 @@ src_prepare() {
 	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
-	eautoreconf
+	bitcoincore_autoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-ccache \
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
 		$(use_with dbus qtdbus)  \
-		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
 		$(use_with qrcode qrencode)  \
-		$(use_enable test tests)  \
-		--with-system-leveldb  \
-		--without-utils --without-daemon \
-		--without-libs \
 		--with-gui
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm "${D}/usr/bin/test_bitcoin"
+	bitcoincore_src_install
 
 	insinto /usr/share/pixmaps
 	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
 	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
 
-	dodoc doc/README.md doc/release-notes.md
 	dodoc doc/assets-attribution.md doc/tor.md
 	doman contrib/debian/manpages/bitcoin-qt.1
 
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index cb53a2afe7c9..3e1470a5ba0d 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -12,8 +12,16 @@
 	</maintainer>
 	<use>
 		<flag name='1stclassmsg'>Enable first-class Bitcoin message tools</flag>
+		<flag name='bitcoin_policy_cpfp'>Child-Pays-For-Parent policy: If you mine, you will give consideration to child transaction fees to pay for their parents</flag>
+		<flag name='bitcoin_policy_dcmp'>Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
+		<flag name='bitcoin_policy_rbf'>Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
+		<flag name='bitcoin_policy_spamfilter'>Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name='ljr'>Enable Luke Dashjr's patches</flag>
 		<flag name='ljr-antispam'>Enable Luke Dashjr's address-based spam filter</flag>
 		<flag name='qrcode'>Enable generation of QR Codes for receiving payments</flag>
+		<flag name='upnp'>Enable Universal Plug and Play</flag>
+		<flag name='wallet'>Enable wallet support</flag>
+		<flag name='xt'>Enable Mike Hearn's Bitcoin XT patches</flag>
+		<flag name='zeromq'>Report blocks and transactions via zeromq</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 5f3ec399b372..01aad9aa6d94 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/bitcoind
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.96 2015/01/17 18:30:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.97 2015/02/23 21:31:45 blueness Exp $
+
+*bitcoind-0.9.4 (23 Feb 2015)
+*bitcoind-0.10.0 (23 Feb 2015)
+
+  23 Feb 2015; Anthony G. Basile <blueness@gentoo.org> +bitcoind-0.10.0.ebuild,
+  +bitcoind-0.9.4.ebuild, bitcoind-9999.ebuild, metadata.xml:
+  Version bumps using bitcoincore.eclass
 
   17 Jan 2015; Anthony G. Basile <blueness@gentoo.org> -bitcoind-0.8.5.ebuild:
   Remove older broken stable, bug #536228
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index cf5030584d0f..708db4d4988f 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -13,28 +13,35 @@ AUX bitcoin.initd 2481 SHA256 5dace582c4bf05d893166794ce620ca13b794b695376030f7d
 AUX bitcoin.initd-r1 934 SHA256 8aea8b4ab593ebb7093f1890666d8dd730d5bbc64893b43af1680098bfe531c2 SHA512 2d4313caa1d9ca88bc5c30f28ba012a459863e51cf4bb18415fb77f99f0ba12e7060e84cfc974cc9b993542f66d40d53684814c58d5f03785c25e56e151f00ab WHIRLPOOL 3b31dee4a70fbd5d7572f93e449a6394f55b1e9f63c70471a46913a90698757f390fc358e31f8b497b6d887f30a4fa1aa6bf026cad38be81c5f006f5c7f9d1a8
 AUX bitcoind.logrotate 110 SHA256 9b469c67e7af914199d699ac76279f194010f154be91f8136eddeeddf623a475 SHA512 b0e0634fc33979695fc0f37057f76b264ff3eb2655a8828d505a38621a5bba9fd4eafe47b012e5cb3863d607146b5a2d1a995787ed55cb6d5e6147ab795e1949 WHIRLPOOL 5ebd73178d3228b9477b5eae51ee783857d3a88a765c6802923f2a1d682c00cd4cefbf39e1f2d5192704ff2c72e8b91a38755cece6e139371ea2e75cab461e32
 AUX bitcoind.service 869 SHA256 c24332570f8ac155847372a4f9019a47a2e3c8c15435584dac4153b8eb300bc7 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea WHIRLPOOL 7992f776ac36277ce83898920ed5a8abc6b031f1d88214150c362c6f5befc869eb9901bd346da74da9fb56bda500fe9d3d9ff8dd46f1b3f257691cb106754a93
+DIST bitcoin-0.10.0.ljr20150220.patches.tar.xz 34536 SHA256 cac6b61e34f1903d369568895072b7c31e4aed2cceae4c25c1e5b80150c92494 SHA512 08913029dcbf9b43fafbc76525061c18d4e033ac1e88b781301064a35d2f099b4de83e4e964197361657a8c0de49ad463d7004c6af485c09df3589a75928ef19 WHIRLPOOL 0032fc98e947b68c37350b2defc7b2cc160570078bcd8bf0d0e4c435dec16f9bc3149a1117acc7998862bf0206fdbc3752e2b426fe1d51eb4bcb4942bf67b77d
 DIST bitcoin-0.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a
+DIST bitcoin-rbf-v0.10.0.patch 22353 SHA256 3e3be932da3785e440a89e2c7779a86a7414c8966b8625a177c421cf2f77bc14 SHA512 234b57b174b1583e3eed11938a38c4b02f8031431d7d27db3adce87ab2c22d7f6b04ca25ac2fafa76da2aa2c549733190dcaca30a9bbc998c61d26374f5075ef WHIRLPOOL 3d95a63c5fd823fda3752c0c41e7ffc51b7db14cba3a6610a2ebcc2ddca54d907421695932d49823ac38e1e6227a3ccab685470c829997ccdb1173751ba327c5
+DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3
 DIST bitcoin-v0.8.6.tgz 3194026 SHA256 26fd485823ee15a823ca51a5ac7ed8664079ef15356a030e74a01f1a7a157170 SHA512 88e1d5dece485beaa95571016f41239db616323508038ea59d0fa3608639c03af06c0d782df3bf5a67d45d25c976bc07b977504ca6390e147e3b8605f3d3ce86 WHIRLPOOL 86a5118dda3f68226d30794bc1b363a75479fd55648146e4347017416d730c23ef4168553a5e70d95466157bf89055def81647790fe414d6182c1baf3e397344
 DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438f01c6c45f0ce3aabf9bd428 SHA512 cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66 WHIRLPOOL 6ce18de9a2b24cedd88e110088d0747452f8403b6239df9212b673e4a893e059bdea2640b13b6fde659a866d4a6a3b4fa62dde3adbf957b80104d41c0e4aeb18
+DIST bitcoin-v0.9.4.tgz 4885466 SHA256 e7d17bd33a51a755b2d23f3bd9f384a272d87a234d02789056b2e4b8a8a92ca1 SHA512 6f13b3adf8791458e8eb7c1e62cbb2277f2caeb36c21cf0d783db15473cb0f29047bc3939c529ce893437aaf3eac0e7af2b161bd82381434a16474611136de06 WHIRLPOOL a65841ef1bf44066ed7548f81c5efaf59bb1adb99a698bd2e9910e09c395518218d8443180fcd0f63c7c938e9852c36a27b5f021b128e8c4973ec427fe0995ed
+DIST bitcoinxt-v0.10.0.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
+EBUILD bitcoind-0.10.0.ebuild 1889 SHA256 ef62ae5ea389973ae4123bfcbf4e295135ae26fe8698fee7ec7f945131867646 SHA512 f323d2fc9a8f18982e78867f8b28a36b182b8d3666101ecfc6b8933835b2b0ddb167ecd9f05fac88b8c87a8dd3e754570318d8df2df4518ce851fc3fd52e4d8e WHIRLPOOL 774681f447926340cd88124585694522fd72d9e352265488e094acfc33e77b0c38fe2d742a1a32892f30ef5f6365217832cfcc9e64d478f34056c0d310b42ac0
 EBUILD bitcoind-0.8.6-r2.ebuild 2898 SHA256 556bb6296952876f47a4a9eac1a7acdc6f21eb4844e3f933eebd0d2f3bc6b490 SHA512 98c50fe05521128e415bf8b4d3d17cf38b49c508d6ce0065e8494c4b90a7b885562f1d53af0003444c181509819fd7918ae908871ddd6b9411862d0be7925cd0 WHIRLPOOL 31642b1f5399b334313c61baae8a6a5fc6460f5b77762abe3912133702278d404a783586f358f4f679849283c6a81c381ecbfac6b204ba5b21722da695212bd0
 EBUILD bitcoind-0.9.3-r1.ebuild 2843 SHA256 09e92c05b8ba310525a2e8abfb3502c7931e86b328b1842daab316ec66bd8f89 SHA512 d9fb4bfcf828c9c2e1844a21bae41ed677a8dadb3048b4e33bfa62a5d19ffe78d21c0f3fadc80d688cfe9dcbea26cc0a6f009f84569eda72d9bf589688a5b11d WHIRLPOOL 61d28949152cb693affb300777e20b1b5272d887d041fc4b2cf66030f810b58528864acb561ed8ae8b53672db8221ba8ca439f2f62d9c97a1f34ceb3782aec05
-EBUILD bitcoind-9999.ebuild 2604 SHA256 df1c5de3335f7bb489324db5ba95e7c2d590404c04f8dffb703707e5327d1466 SHA512 751a4cfa540dbd03188a094ff22b44ad69a2462f91df61fccd5ac316ed01a80d0b4866b71711c4415b8952590bfaa91b9b7af43a3f24bb20fa3b9590446ae4ea WHIRLPOOL 74b2bdb375770361e0c3f11da3392e37ae667a7eefceafbe66f383c5861dd1af79423bd8e39789393a7d8cc5a9533e3b206421b6024a8e91710580d9e970c27a
-MISC ChangeLog 21760 SHA256 3b8630f069936ca4ec3880563dc02a2a9422074ca712b2d7caebb04006a82d4b SHA512 400f14f99f0e7f95ea77f9920c3daf45c94c8d958d89cd6939ca38e8dddf20fd3e55c4ff4fb5d5022c21a6d8bbf11fffec86ab8b53bdd0e800a6a9345956670a WHIRLPOOL 7c3b40371921244af83fa223e74a02bce5ee00ba39722b38c73b6f0e047693d8046b0bfc35a1cf15a67a1c4b77bf178316f4a6134ce00a90e8bb2635cb3edf54
-MISC metadata.xml 709 SHA256 ed87f13da36e397366e78990d77271e30be2954acf6753615045ea6c829ece26 SHA512 1a75418c3e930a1a39b6291e980821077e38411fa05812ced0293b157901e356efd5013406c530ea2a6481171a505ea7c48a34d54e7dfd25b2cfd15f6069bf0c WHIRLPOOL 9c156b463d09290d7c58a372892c28b644f277cfe87f985416fa16e67fc9cb05a2e3ffc189cddb3d51eaeffc78490626369c8b1f71e91efb6d9ff6ee9c248890
+EBUILD bitcoind-0.9.4.ebuild 2795 SHA256 2761986428596808c8497ce96ddc4e0dd6d16c1406f881132250ec7adb78cad8 SHA512 5a473e883747930b9a142b4dc702b5384fb03ea46577fc8bc0bcccc4ec938fafd9d53ce558977c180a0bfc97f5a1f9b84a0d62dbae40114f5bc70530acda4193 WHIRLPOOL 6ff096cff5488878ca78ecf535b0b681e9ac1037b4fdb6c0b78e7ec198d9b792c1131e35b786ef1fdecce3fa9030d996382bbc177e577a2582940c2ad9ea0697
+EBUILD bitcoind-9999.ebuild 1701 SHA256 51e29802020a03214af87328807de32127d6e3e8e91982287eaa8c88b347f8d0 SHA512 2539dc72d40ffb275a38c2e596cbd4f88c723f0d1ea53e7392165ba3204667e10e7f4f9806879b87e9deb9b304cb2e7fcd40bb2ab9068ea77bb057003525eb28 WHIRLPOOL 5218e8ac03efd05a1ff0ea9d007b9f9521a5169271cca1fdb3a457ae66fe8e0b96ef0a79942d4ef511f0b3789ec012013a8a83be6789740b22fda5fe27af0157
+MISC ChangeLog 22006 SHA256 5a8ce7dfacff219364d1ef28f4203db8b86934e2f18bd0329c7d3fb7ca5dafd4 SHA512 7566992497dc34634b5b32ec9823b4064b205aee57d18fa00f04d4cd9eb8ae58f5bb48d47446821b33fff5a58da56efb4e6c4bba1570e85412778edf64012c76 WHIRLPOOL b4d97cf9ee532809c19b8b631030138de017f70e9ff55160ae059c7a51902bac0d1f3a5de3d1ffc185bcbc607d4b4ffe1e64fc41d2370d0f8b741c1f627d169b
+MISC metadata.xml 1473 SHA256 10d1dedace964ae686531c3fae71f3a13f8e4f0c5895379085a7c691ba2d1ce3 SHA512 6fcc957b7fad3380ba1c6b99ecbcfc9dc7d0113ebdb49a41896ffbaad5a486688ac3fa10d424d31ef4b039b5d81c738f9ac0430142956221b2a951b8dbf68e83 WHIRLPOOL 42cb131078b6b96be6518633cd3b542fcb10cc2c0821628254e083c2f7ca948f611b1197df44e28d07e213aa99e9fbcacebce40946cb0a5260edce975ee654fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUuqqvAAoJEJOE+m71LUu6THAQALDcyBjM5VERXngVgP3Xv4Q2
-ciW3mjTN4o4V3LkcOUMaL3uvqXLBBcVDNDEjP3hj1+xX85JOcjggZYdgFgmmSiF/
-/py8IPwQhgriNU7TKJGyVYGsJT4z4BY0aZiiMhNKFFBuzHjQUaY8FZBY1uHAnTG2
-7Lym1ylXqpXf2zOYn2Ov+XVVb8WEfK7Y0BPIakeDHlhey4HnkeCs4ftsOGWj9G+Z
-UeGW9U4sfktp5rhCs+Tgbsmt/2ixCmFJ15uMFwiEOBjEHZ6bbeKj1nqYYK5yVCz6
-vaqbHqXemgNbqvgNLFYwbkZ7+38XtjDM/r3XYFDJI+01wBbv9pWBXUYG9FfzMk+k
-YnJ9ffoca6Ki8+KydB+cC604ISUCe/cmy/7zeOc2ocnoFqQtIJ/GDDDxFVuHMaYX
-tZHDETN82RD/jpWKkq7m11clKi72U2BYCd/4sq1y4d6/9GH410Y5oQBl4+Og2fAO
-MDgp1WkpQUVPdlfWsgLEvMu51uw1Hz2AAWNi9kylk9PfVPxE2Ux7QNqGtAYTNCJc
-Xov4jidYQqnTf3nkILrZ4ClciMVX+r5AxTmzzsLXSUio27YDbl59cbK3uVpRCFHX
-wfuO2Wgyciwp+TsHlcB9ICYmaZoIHa7JwStRqm4iBOvTpqyXMdlKRHD5PJtAIR9y
-TzkpLHlvZLVFthYPoodJ
-=unXO
+iQIcBAEBCAAGBQJU65y1AAoJEJOE+m71LUu6EP8QAIS3zyBOYWYM44B+338qYdpX
+fO2Vqgoaot1mAykgEzFgbUJXcJZO2KHpESi6jAoUrn+xLou459/fk+zkecomXlxZ
+BYeImZJHRJ7BS5BdCY376x4qdat3mz0spdDOFxzlEQIxyOYJxRS+iJ9cH43a2Pgm
+6cHtn5UmI0+GnzT2Yhu6HdAOfZaT1K9T6KgPnqBxa+o+BQ0l8w7sLrB3aDh6vbWE
+ymAIRrKau+sllnJnh2dRV9e6Ej7mom7pYsstD+nIz+bNsxA7JBKjOCacOxHPtkp3
+8z3iyHfFXWyD8OHedy2uPKZJ97xNA50Hy5cE30eRjoKbqdKbVD1CHSNeCzbFs6e4
+H4Eu4BurMwwnpTkiF7DkQcf4xDGxhnqzwucNNtuTteoddXGwuJJtYNv0I0G9j1Wr
+KDxqP+W+FswiwOHMk0wNpP38XxXoCP8IGptCSRcrqkjrGa457xOlWBq8Hrc0oHj8
+q73fAl6Smx8cojDTBQ/HHgysEk9UYtMUVqnBUO00If8YqCSA6gBgUB79+1hmHhnv
+cuoWA/i3Yyi0suUBigq3EL8GY2pPIXESVZpr+npXzNyALgq/M8kqiga0RBfs9BXR
+GR9J+GP4DMyMcMXud1LZTXOJWf3aWxaq/vhlOaKpv0z937eSWG/t27POA+0S4KbX
+tUCzde3GvTw7DSNQb8Ah
+=PbCZ
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoind/bitcoind-0.10.0.ebuild b/net-p2p/bitcoind/bitcoind-0.10.0.ebuild
new file mode 100644
index 000000000000..9ae4d997ac58
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.10.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.10.0.ebuild,v 1.1 2015/02/23 21:31:45 blueness Exp $
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
+BITCOINCORE_LJR_DATE="20150220"
+BITCOINCORE_IUSE="examples +ljr logrotate test upnp +wallet xt zeromq"
+BITCOINCORE_POLICY_PATCHES="+cpfp +dcmp rbf +spamfilter"
+inherit bash-completion-r1 bitcoincore user systemd
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	virtual/bitcoin-leveldb
+	logrotate? (
+		app-admin/logrotate
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_configure() {
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
+		--with-daemon
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	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-r1" ${PN}
+	systemd_dounit "${FILESDIR}/bitcoind.service"
+
+	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/assets-attribution.md doc/tor.md
+	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{bitrpc,pyminer,qos,spendfrom,tidy_datadir.sh}
+	fi
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
+	fi
+}
diff --git a/net-p2p/bitcoind/bitcoind-0.9.4.ebuild b/net-p2p/bitcoind/bitcoind-0.9.4.ebuild
new file mode 100644
index 000000000000..cf972f888468
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.9.4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2010-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.4.ebuild,v 1.1 2015/02/23 21:31:45 blueness Exp $
+
+EAPI=4
+
+DB_VER="4.8"
+
+inherit autotools bash-completion-r1 db-use eutils user versionator systemd
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+LJR_PV="0.9.3.ljr20141002"
+LJR_PATCH="bitcoin-${LJR_PV}.patch"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v${PV}.tgz
+	ljr? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/luke-jr/0.9.x/${LJR_PV}/${LJR_PATCH}.xz )
+"
+
+LICENSE="MIT ISC GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="examples ljr ljr-antispam logrotate test upnp +wallet"
+
+REQUIRED_USE="
+	ljr-antispam? ( ljr )
+"
+RDEPEND="
+	>=dev-libs/boost-1.41.0[threads(+)]
+	dev-libs/openssl:0[-bindist]
+	logrotate? (
+		app-admin/logrotate
+	)
+	upnp? (
+		net-libs/miniupnpc
+	)
+	wallet? (
+		sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+	)
+	virtual/bitcoin-leveldb
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+	sys-apps/sed
+"
+
+S="${WORKDIR}/${MyP}"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_prepare() {
+	if use ljr; then
+		epatch "${WORKDIR}/${LJR_PATCH}"
+		use ljr-antispam || epatch "${FILESDIR}/0.9.x-ljr_noblacklist.patch"
+	else
+		epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
+	fi
+	rm -r src/leveldb
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-ccache \
+		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
+		$(use_enable test tests)  \
+		$(use_enable wallet)  \
+		--with-system-leveldb  \
+		--without-cli  \
+		--without-gui
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	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-r1" ${PN}
+	systemd_dounit "${FILESDIR}/bitcoind.service"
+
+	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.md doc/release-notes.md
+	dodoc doc/tor.md
+	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{bitrpc,pyminer,qos,spendfrom,tidy_datadir.sh}
+	fi
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
+	fi
+}
diff --git a/net-p2p/bitcoind/bitcoind-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild
index 5ce082d82bdb..811634d8bcd7 100644
--- a/net-p2p/bitcoind/bitcoind-9999.ebuild
+++ b/net-p2p/bitcoind/bitcoind-9999.ebuild
@@ -1,48 +1,24 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild,v 1.2 2014/11/21 12:14:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild,v 1.3 2015/02/23 21:31:45 blueness Exp $
 
-EAPI=4
+EAPI=5
 
-DB_VER="4.8"
-
-inherit autotools bash-completion-r1 db-use eutils git-2 user versionator systemd
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
+BITCOINCORE_IUSE="examples logrotate test upnp +wallet"
+inherit bash-completion-r1 bitcoincore user systemd
 
 DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="
-"
-EGIT_PROJECT='bitcoin'
-EGIT_REPO_URI="git://github.com/bitcoin/bitcoin.git https://github.com/bitcoin/bitcoin.git"
-
-LICENSE="MIT ISC GPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples logrotate test upnp +wallet"
 
 RDEPEND="
-	>=dev-libs/boost-1.52.0[threads(+)]
-	dev-libs/openssl:0[-bindist]
+	virtual/bitcoin-leveldb
 	logrotate? (
 		app-admin/logrotate
 	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	wallet? (
-		sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	)
-	virtual/bitcoin-leveldb
-	dev-libs/libsecp256k1
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-	sys-apps/sed
 "
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	local UG='bitcoin'
@@ -50,33 +26,14 @@ pkg_setup() {
 	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
-	epatch "${FILESDIR}/${PV}-sys_libsecp256k1.patch"
-	rm -r src/leveldb src/secp256k1
-	eautoreconf
-}
-
 src_configure() {
-	econf \
-		--disable-ccache \
-		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
-		$(use_enable test tests)  \
-		$(use_enable wallet)  \
-		--with-system-leveldb  \
-		--without-libs \
-		--without-utils  \
-		--without-gui
-}
-
-src_test() {
-	emake check
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
+		--with-daemon
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm "${D}/usr/bin/test_bitcoin"
+	bitcoincore_src_install
 
 	insinto /etc/bitcoin
 	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
@@ -93,7 +50,6 @@ src_install() {
 	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
 	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
 
-	dodoc doc/README.md doc/release-notes.md
 	dodoc doc/assets-attribution.md doc/tor.md
 	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
 
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index a3ca8995168d..4f1ee3a01a1c 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -11,10 +11,16 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
+		<flag name='bitcoin_policy_cpfp'>Child-Pays-For-Parent policy: If you mine, you will give consideration to child transaction fees to pay for their parents</flag>
+		<flag name='bitcoin_policy_dcmp'>Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
+		<flag name='bitcoin_policy_rbf'>Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
+		<flag name='bitcoin_policy_spamfilter'>Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name='ljr'>Enable Luke Dashjr's patches</flag>
 		<flag name='ljr-antispam'>Enable Luke Dashjr's address-based spam filter</flag>
 		<flag name='logrotate'>Use app-admin/logrotate for rotating logs</flag>
 		<flag name='upnp'>Enable Universal Plug and Play</flag>
 		<flag name='wallet'>Enable wallet support</flag>
+		<flag name='xt'>Enable Mike Hearn's Bitcoin XT patches</flag>
+		<flag name='zeromq'>Report blocks and transactions via zeromq</flag>
 	</use>
 </pkgmetadata>