gentoo resync : 31.12.2017 (final resync this year)

12 files changed, 583 insertions, 3 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 17e1053fa343..01c4b2f61a5c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 2cde86bb8cdf..8a2c28e86058 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,11 +1,14 @@
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoin-cli-0.13.0.ebuild 845 BLAKE2B 4b8c3ed24ff36bcedd3ac20074844e9704bd77a8d21d33f973836ef32dc2127ac8aec56321a28edb8db1857acbb239c909360b436669743ccb9a85002f685ba6 SHA512 6e506aca05ad2dc9e4218117911c82130815bdf559b8c66a906be161187e4d3f8f4a51d3eafe3ecfad91e32a18e6363ad1b16701bece15776998bda4106c40ba
 EBUILD bitcoin-cli-0.13.1.ebuild 842 BLAKE2B 423aadcd0b341bd0c54a08a08fef112d6a33a8b432e3ca444b6a9e3d06fa38637dd42d6d17a2a36149a3597f38bc2ab63bf00268f382ab9cc86842554a86ab2b SHA512 f9d27641b2c952c5de81e950e8c8ce279ae60cdfd13d0ae28bf01ddc1011b597551f353b3bbdc33f0f1e50f4db8cac11b40422833d916a559558ebcda9b9d432
 EBUILD bitcoin-cli-0.13.2.ebuild 846 BLAKE2B 688ea6c2ae9b01e2e538eaa183f3c9b88a3217acf341d9bc12b65caa99efa0d45257b75345253a3c9f646137799f7ab2f2220598257ef852da33be7f98bd759e SHA512 d4274818fef2a1ccc78813be7ecee1aa2fc490b9d13126cbfbf352b2d45520d40e2493e42f49ce28a8d4f0d0951d6d6aa671e156a811d608fd5f150a5de0219a
+EBUILD bitcoin-cli-0.15.1.ebuild 2443 BLAKE2B 1fafb537902d0d76d92ca4dd1feaaf8cf9d291f871a92b2826cd2bd7d4f1ce5197c60a65e3a58a943aafaa8f2c64eb11c725752f78457d83248b786715bf2f44 SHA512 5b5323387d760589b909ab620829e6f1ef5d812344049cf86f6692c37674db0c63d956bfea105249c4c115811c3b85a9007b78f08ad917ecd7bfe4494fcc21f6
 EBUILD bitcoin-cli-9999.ebuild 479 BLAKE2B 29cfd04cc2ecfece1fbbcaf4439c183540bbb60895aa6a820ed2a7a022d8c9fa18bff7cc1bd056882263c27486803d105641646c0e0a4fe975932f3a534c3f21 SHA512 fdae52acd4307be54a7de8523a3cec9e8917e7ec11f9e1cbe876d5407c17db1d4ec9a4d35e864817d0dd3242ba7b9afbd6a7751995441dc82981807c03108141
-MISC metadata.xml 615 BLAKE2B 4db8ef430b47bad4dc20d6876c6356be3ed9cad2b528abf3351bfd6a5794147dd919dcd587a4dc1fd16b970f45e0faeac5edc2f2330d7090011fd557b6d133eb SHA512 040c29a3e1c5221656295920117d05b5d098c445b77efdd39a7e6c3877c663622b98eddbd485e0b6599281ca2a5939035328ffcb7ac1a2cd3d3d1e6324f6b638
+MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
new file mode 100644
index 000000000000..a63af598ca66
--- /dev/null
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="knots libressl"
+
+DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitcoind"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libevent
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-experimental-asm
+		--without-qtdbus
+		--with-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/bitcoin-cli.bash-completion ${PN}
+}
diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index 3747c3a5a6e9..6f3a3a4dd7b3 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index f3e84fdcc3fe..f1df7a866645 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -2,11 +2,14 @@ AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoin-qt-0.13.0.ebuild 3357 BLAKE2B 059d39373790811281935c9c334ecbbce1482b151671fcf38ee725b5015d0a3e40b2b308441b516854e2a8e0de322a3dd0246058186f27fcfe7b7a6167a6caa3 SHA512 e497fedd35c0f5fd8658b0d66e02eb7ef465a5243c41623094905e63f58e2d3c553313602242d67a9b3c1810f588c6aae7cdc0aafa98ee7a48248e1f960c7b1b
 EBUILD bitcoin-qt-0.13.1-r1.ebuild 3439 BLAKE2B e515048dcd52c352a363c8aa6eb17373e95fc0f238ea7d11c482f1571fbb1cedd232a52985f2111508b87fb94a0561710187cca3056c3bc6696402b2337282df SHA512 3532a46a44b4cd323968b1ca3984c752b89ea4f728003ccd709218bcc55a8f9aa9efdfcda2de8dd82f5047833aa9c4bffa182f8b56f0af85802da6dea5085b1b
 EBUILD bitcoin-qt-0.13.2.ebuild 3513 BLAKE2B 2cd862f6138b273d3db66ecafaaa43e2984dc05a6826d39b81c45d9982f33c65f00b26912c4161f383576aa9aad7b41dc003b1f22343b4cdd250568285efdd64 SHA512 067c72153669280b7d62f908cc911df53e86e14c165fd3a3af5a93f3e496cf2f334e534bffa1e07be9af466db1b5e82bb8a5c892fd9317e88228205e5a22f5bf
+EBUILD bitcoin-qt-0.15.1.ebuild 7090 BLAKE2B 5042ca2f8225671ff830f6d978567b209981cf74af3f79e3a1eaa4fce18efc739604a9e13fc875800f71602970d827de1bf30c9aef3c701122c8bd47f29470b6 SHA512 2f3ff434ebb82f91031b700d08a7ce432019c714ae56f07b16dd0b05aded01ee47b5f64408975fd22ff79955e1152b147471d876d50328e8ec8dae04b0fb6706
 EBUILD bitcoin-qt-9999.ebuild 2667 BLAKE2B a9851055483c650843afb8f6d5447688826d11ba879a19e3e2777259578b07bc8527bebb558cbc5210ca21c528d09cd679525460b5ed88e78f4d2dd94fefa5ef SHA512 8ffecdcf0425ac4339235a2f90068128e8415583bf6ba903d86af36bee48a268f6cc952229c17be120f303c57c8f9b12208112d2a0533917fd5b6fc58905744f
-MISC metadata.xml 1422 BLAKE2B 72865e9a41f50c63d52d46933a981a7eea19428029b7858c958d51e489d19c18a56a2f7eb68f5fa5bd735e25214d09cda59bf9f87de8cf7a2e82ee2bfe5e1e69 SHA512 7a42aaaedd65478095e92a93a55e1f121d161cb60ebbd74c3288df89eefd81f307664da5d35469f0937d8e1afd238968d4489a144e357ae78f2a155c837dc2b6
+MISC metadata.xml 1615 BLAKE2B 76b79cea9c4faa4a557ca1c4507a1bdd8519c8c3ef64933241091f50de7c3d2110d45ffea8fa7431eb4eabe822d9e12e368ffa3d43b79e7e2cec7fb1c3ed5589 SHA512 99ef056b83c0f58dc1c6c50b73e5411ca0f4813df025ca268acf3f68720b1cc5d145e319183237e36b834bdf120ecc9c0bcef00996fc04a6c8d329f8a870b47a
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
new file mode 100644
index 000000000000..64339edd7ca2
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode +http test +tor upnp +wallet zeromq"
+LANGS="af af:af_ZA am ar be:be_BY bg bg:bg_BG bn bs ca ca@valencia ca:ca_ES cs cy da de de:de_DE el el:el_GR en en_AU en_GB en_US eo es es_419 es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et et:et_EE eu:eu_ES fa fa:fa_IR fi fr fr_CA fr:fr_FR gl he he:he_IL hi:hi_IN hr hu hu:hu_HU id id:id_ID is it it:it_IT ja ja:ja_JP ka kk:kk_KZ ko:ko_KR ku:ku_IQ ky la lt lv:lv_LV mk:mk_MK mn ms ms:ms_MY my nb nb:nb_NO ne nl nl:nl_NL pam pl pl:pl_PL pt pt_BR pt_PT ro ro:ro_RO ru ru:ru_RU si sk sl:sl_SI sn sq sr sr-Latn:sr@latin sv ta te th th:th_TH tr tr:tr_TR uk ur_PK uz@Cyrl vi vi:vi_VN zh zh_CN zh_HK zh_TW"
+KNOTS_LANGS="am hu_HU is ms pl_PL pt sn"
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	libevent? ( dev-libs/libevent )
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916 )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] )
+	zeromq? ( net-libs/zeromq )
+	virtual/bitcoin-leveldb
+	bip70? ( dev-libs/protobuf )
+	qrcode? (
+		media-gfx/qrencode
+	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dbus? (
+		dev-qt/qtdbus:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	knots? (
+		gnome-base/librsvg
+		media-gfx/imagemagick[png]
+	)
+"
+REQUIRED_USE="
+	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
+"
+
+declare -A LANG2USE USE2LANGS
+bitcoin_langs_prep() {
+	local lang l10n
+	for lang in ${LANGS}; do
+		l10n="${lang/:*/}"
+		l10n="${l10n/[@_]/-}"
+		lang="${lang/*:/}"
+		LANG2USE["${lang}"]="${l10n}"
+		USE2LANGS["${l10n}"]+=" ${lang}"
+	done
+}
+bitcoin_langs_prep
+
+bitcoin_lang2use() {
+	local l
+	for l; do
+		echo l10n_${LANG2USE["${l}"]}
+	done
+}
+
+IUSE+=" $(bitcoin_lang2use ${!LANG2USE[@]})"
+
+bitcoin_lang_requireduse() {
+	local lang l10n knots_exclusive
+	for l10n in ${!USE2LANGS[@]}; do
+		for lang in ${USE2LANGS["${l10n}"]}; do
+			if ! has $lang $KNOTS_LANGS; then
+				continue 2
+			fi
+		done
+		echo "l10n_${l10n}? ( knots )"
+	done
+}
+REQUIRED_USE+=" $(bitcoin_lang_requireduse)"
+
+DOCS=( doc/bips.md doc/files.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+	if use bitcoin_policy_rbf; then
+		einfo "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order."
+	else
+		einfo "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
+	fi
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
+
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	sed -i 's/^\(Icon=\).*$/\1bitcoin-qt/;s/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die
+
+	local filt= yeslang= nolang= lan ts x
+
+	for lan in $LANGS; do
+		lan="${lan/*:/}"
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			if has $lan $KNOTS_LANGS && ! use knots; then
+				# Expected
+				continue
+			fi
+			die "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in src/qt/locale/*.ts
+	do
+		x="${ts/*bitcoin_/}"
+		x="${x/.ts/}"
+		if ! use "$(bitcoin_lang2use "$x")"; then
+			nolang="$nolang $x"
+			rm "$ts" || die
+			filt="$filt\\|$x"
+		else
+			yeslang="$yeslang $x"
+		fi
+	done
+	filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm experimental-asm)
+		$(use_enable bip70)
+		$(use_with dbus qtdbus)
+		$(use_with libevent)
+		$(use_with qrcode qrencode)
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-gui=qt5
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--disable-ccache
+		--disable-static
+		--with-system-leveldb
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /usr/share/pixmaps
+	if use knots; then
+		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
+	else
+		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	fi
+	insinto /usr/share/applications
+	doins "contrib/debian/bitcoin-qt.desktop"
+
+	use libevent && dodoc doc/REST-interface.md doc/tor.md
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+		dosym "../kde4/services/bitcoin-qt.protocol" "/usr/share/kservices5/bitcoin-qt.protocol"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	update_caches
+
+	if use tor; then
+		einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and add your that user to the 'tor' user group"
+	fi
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index a396da394df7..60c0dfd8151f 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -10,6 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="asm">Enable assembly for optimization</flag>
+		<flag name="bip70">Enable support for the BIP70 payment protocol</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="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
@@ -24,5 +26,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 7e030192fcd4..4113319595dd 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,14 +1,19 @@
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
+AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service 869 BLAKE2B 65628a2c6effef34e4cf8fd10bc50b02bbfa8c49e486266bab8e9b7be19a57969d75e6ce6ff82dc2e2f3ddae29fceee9e61a076cbf5ac6666d772514c88c2093 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea
+AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
+DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
 DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
 DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
+DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD bitcoind-0.13.0.ebuild 1922 BLAKE2B 4dbcdb8ace05ce867da8cce4f74f561639376ddc9a2b70d057af2766b7e7f2f2e3f1a11594e4c9d204ce4bbaf287175912dc3353cf0e20aadf3c30ed2cda6912 SHA512 231f04e06fe2a9820f66147ba971c96901f506bb74878006c36bb5f459a41387fbd5df328f36c447235af8f81a28e62ab6280a4eeea88bf7261c57d3f2660549
 EBUILD bitcoind-0.13.1.ebuild 1919 BLAKE2B edbfe9ccb5f7d3f5526f531b51ff117bbb85f3b7bdf651badc7fcacbc5ba29e8ffb2f4ffff1f56f015fd0a5383b74f811e91dc6a214264f431edc25527548efd SHA512 da9c7226dcc905263be4f82330217e8680e5917b7d15620d89ecd0e13e6328fa4d5c8a282950e9824d3c0c6d6e1677c5baaf3c87515aa7c6515afa2d4e921098
 EBUILD bitcoind-0.13.2.ebuild 1924 BLAKE2B 5c1ce54380441d7e082772510f6b03d2c8983566ee662af7601e9abf0cfd5c981f183be12a9d87e0b0daf0b07943f3c1c18ff1d079f2ffe00c3912068e3a37a2 SHA512 cfdff039da31701c29cdefc2f66c47a3715468c4e5da90d2bfb30bca8d4ec778b498b671df2a28820f4017a32e0f5d8f4d5b78174c0e7bcf92cfbbbc48d5238b
+EBUILD bitcoind-0.15.1.ebuild 4928 BLAKE2B ca4aab401dae803f3e841e07262d876e729723b30df973e3673cf1381b73eabb43e2238beae940c6d34538b229d9cbe5802d7ce393178d94ac79970f5ed39a97 SHA512 059ee69a975fd402e2c4fcca43bcd9fc9488db63f376950a45627082e4bc648cae31b96c5e8dded00f40a4c77daf563f7b6d14dac0953fe7ae76d5362d612d37
 EBUILD bitcoind-9999.ebuild 1725 BLAKE2B 198ce5db702463c5e584744457c167a9e527e2b2b4a2d7cf816c698f5ed28d1b7520b874ba9f1510e16197b9331c80836481426a98852bb2df559799f21c5334 SHA512 29aeb113c439794d2b5f3854cb473136ec2389da0ffd4ea67a01a31f515a6bfde924c252913c003c0123babcf362fe2cb287387ad4823e27c0a28e15c7dfb064
-MISC metadata.xml 1099 BLAKE2B 7bf0d05a908f5e2cb716c7109e5b942fcd68b737f1f8ee0f694d446aa6944cd9c86506932c9388b9730d490b5b1c67381bd37d21e1d297fa6ecc75b622a689cf SHA512 84c60530afee3534c3057b259ef54767442765023ec1fb1d20430b6f07bd07947f40a582897a1c09d57f1290fb97955c3b188993f12fbe5421a39cb62015608a
+MISC metadata.xml 1218 BLAKE2B e01b34ede70163c5a9793bd1d2109ec21b9aaed014d22e4c1f8d16800d6ffe65e37a67c6697ae04fa64e6a540d034a553e332866dd3e0f086a4dd90c527d48f7 SHA512 02bf23ba23c56f439491c168f8801e1d325aff4f98113b9be486a2e6289135f0fa650c135af4a2967cc634a6a85a15f145d1ea6e05e959c4e4f6a5ddbac1399e
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
new file mode 100644
index 000000000000..3ada285926eb
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 2010-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DB_VER="4.8"
+inherit autotools bash-completion-r1 db-use systemd user
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
+KNOTS_PV="${PV}.knots20171111"
+KNOTS_P="${MyPN}-${KNOTS_PV}"
+
+IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+
+SRC_URI="
+	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
+	http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
+KNOTS_DESC="http://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/libevent
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
+	dev-libs/univalue
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	upnp? ( >=net-libs/miniupnpc-1.9.20150916 )
+	wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] )
+	zeromq? ( net-libs/zeromq )
+	virtual/bitcoin-leveldb
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( doc/bips.md doc/files.md doc/reduce-traffic.md doc/release-notes.md )
+
+S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		einfo "You are building ${PN} from Bitcoin Knots."
+		einfo "For more information, see ${KNOTS_DESC}"
+	else
+		einfo "You are building ${PN} from Bitcoin Core."
+		einfo "For more information, see ${CORE_DESC}"
+	fi
+	if use bitcoin_policy_rbf; then
+		einfo "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order."
+	else
+		einfo "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
+	fi
+}
+
+pkg_setup() {
+	enewgroup bitcoin
+	enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
+}
+
+KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
+
+src_prepare() {
+	sed -i 's/runscript/openrc-run/' contrib/init/${PN}.openrc || die
+
+	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
+
+	eapply "$(KNOTS_PATCH syslibs)"
+
+	if use knots; then
+		eapply "$(KNOTS_PATCH f)"
+		eapply "$(KNOTS_PATCH branding)"
+		eapply "$(KNOTS_PATCH ts)"
+	fi
+
+	eapply_user
+
+	if ! use bitcoin_policy_rbf; then
+		sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
+	fi
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		$(use_enable asm experimental-asm)
+		--without-qtdbus
+		--with-libevent
+		--without-qrencode
+		$(use_with upnp miniupnpc)
+		$(use_enable upnp upnp-default)
+		$(use_enable test tests)
+		$(use_enable wallet)
+		$(use_enable zeromq zmq)
+		--with-daemon
+		--disable-util-cli
+		--disable-util-tx
+		--disable-bench
+		--without-libs
+		--without-gui
+		--disable-ccache
+		--disable-static
+		--with-system-leveldb
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "contrib/init/bitcoind.openrcconf" ${PN}
+	newinitd "contrib/init/bitcoind.openrc" ${PN}
+	systemd_newunit "${FILESDIR}/bitcoind.service-r1" "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/REST-interface.md doc/tor.md
+	doman "${FILESDIR}/bitcoin.conf.5"
+
+	use zeromq && dodoc doc/zmq.md
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{linearize,qos,tidy_datadir.sh}
+		use zeromq && dodoc -r contrib/zmq
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
+}
+
+pkg_postinst() {
+	einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and:"
+	einfo "- if using the init script: add the 'bitcoin' user to the 'tor' user group"
+	einfo" - if running bitcoind directly: add that user to the 'tor' user group"
+}
diff --git a/net-p2p/bitcoind/files/bitcoin.conf.5 b/net-p2p/bitcoind/files/bitcoin.conf.5
new file mode 100644
index 000000000000..839dc26c1aa5
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoin.conf.5
@@ -0,0 +1,19 @@
+.TH BITCOIN.CONF "5" "February 2016" "bitcoin.conf 0.12"
+.SH NAME
+bitcoin.conf \- bitcoin configuration file
+.SH SYNOPSIS
+All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
+.TP
+The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to bitcoind(1) for a up to date list of valid options.
+.TP
+The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
+.SH LOCATION
+bitcoin.conf should be located in $HOME/.bitcoin
+
+.SH "SEE ALSO"
+bitcoind(1)
+.SH AUTHOR
+This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
+
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.
+
diff --git a/net-p2p/bitcoind/files/bitcoind.service-r1 b/net-p2p/bitcoind/files/bitcoind.service-r1
new file mode 100644
index 000000000000..ee113d7615c2
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind.service-r1
@@ -0,0 +1,25 @@
+# It is not recommended to modify this file in-place, because it will
+# be overwritten during package upgrades. If you want to add further
+# options or overwrite existing ones then use
+# $ systemctl edit bitcoind.service
+# See "man systemd.service" for details.
+
+# Note that almost all daemon options could be specified in
+# /etc/bitcoin/bitcoin.conf
+
+[Unit]
+Description=Bitcoin daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/bitcoind -daemon -conf=/etc/bitcoin/bitcoin.conf -pid=/run/bitcoind/bitcoind.pid
+# Creates /run/bitcoind owned by bitcoin
+RuntimeDirectory=bitcoind
+User=bitcoin
+Type=forking
+PIDFile=/run/bitcoind/bitcoind.pid
+Restart=on-failure
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 57acfffa65ef..45a60634af6e 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="asm">Enable assembly for optimization</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="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
@@ -20,5 +21,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>
+		<remote-id type="github">bitcoinknots/bitcoin</remote-id>
 	</upstream>
 </pkgmetadata>