gentoo resync : 27.10.2018

16 files changed, 161 insertions, 617 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index c7ceeafa6c11..f09c193826a5 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 f6270e0018a0..89f5624e80b4 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,7 +1,4 @@
-DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-EBUILD bitcoin-cli-0.15.1.ebuild 2444 BLAKE2B d669c80e3dae939a4b869743c26b45167c70770b5edebf640b10292a9fa9637e794aec41319ef50c593e12e153ee48fe89bd679b193aa352de69ed1937ea5cd8 SHA512 115f6fc08d571ef46a410236ea9cf6c26ccb4c2a45f5abee117d35e30ddf32f912714603e83b89c9735ea45dab2f2e346e445e2fe0ad127292289d56a3b968a0
 EBUILD bitcoin-cli-0.16.3.ebuild 2401 BLAKE2B 1f372febaea711cab1ba45ae3b9e29a55138d34b01235f3c6e375b67621b98086bf5b1982c305c50e050164238723e7e4550f686e86fcd80e35d734109d81b8c SHA512 e836b2ff0c3127febca2574bc09bc7e7e98171eafed08af54a8f5f19c9c87410acdb0be2341b8142f76d90ed450bf3ced1bfe57ecf106a77c865c2e72ce018d0
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
deleted file mode 100644
index f9c7b8764989..000000000000
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2010-2018 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="https://bitcoincore.org/ https://bitcoinknots.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-
-SRC_URI="
-	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
-	https://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="https://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-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 06f87d56255d..edb776d93838 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,9 +1,4 @@
-AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
-AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
-DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-EBUILD bitcoin-qt-0.15.1.ebuild 7198 BLAKE2B ba06d49cb5eb176fef2d617029856b90adc534d236ae117b413e9dc75bfda39250f15c9d4e7b39b89eee305eb6d795e28d049e79936bb510b9b3777387a6eb39 SHA512 bdbb8b14bb79604111b574daf6682a6ec330ad4c3c6b33ab966da5e47d957f841a17e3b1533261e2d851d3b095e86e65eb9665ff7f372868151b1c5bd3110d66
 EBUILD bitcoin-qt-0.16.3.ebuild 4872 BLAKE2B 2cade1bc6b69928e1d05b74e11e29f3c8a79bec23cf8036724d0d535f91ffba04f47f9735a614c32baff08e16e6e863427e61e5e66de9b4752f33e7920ea2ccc SHA512 3409277590f09004dfcb08841eaab154f067d91cba3d265f1ffcfc59237827e25581b38fb296d5db0e7bd4e996b7e8556190227e5af879c786c8131cb043ba3c
-MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20
+MISC metadata.xml 1297 BLAKE2B a5d393ca42a85506f75d526bf01d06dffca54e5e46b6bcefc9f70ea719945539dccc7425ae8938b48dc21a1e09f5d0228d52fd854805c850e67a544797910b7a SHA512 a2963bce834917c9c722b9f427f3030be3a45a1f7e460afcf989affc5a4beb7e0781d55606853d56c967ca474e3d5e43aee0b2a28fd844758b2131dbc2374d3a
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
deleted file mode 100644
index 3e86deab6af5..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 2010-2018 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="https://bitcoincore.org/ https://bitcoinknots.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-
-SRC_URI="
-	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
-	https://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="https://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)"
-	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
-
-	if use knots; then
-		eapply "$(KNOTS_PATCH f)"
-		eapply "$(KNOTS_PATCH branding)"
-		eapply "$(KNOTS_PATCH ts)"
-		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
-	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/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
deleted file mode 100644
index 3d953d9c0a94..000000000000
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
-Author: Luke Dashjr <luke-jr+git@utopios.org>
-Date:   Tue Jan 23 03:37:10 2018 +0000
-
-    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
-
-diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
-index 7826cdc1b3..013846811b 100644
---- a/src/test/script_tests.cpp
-+++ b/src/test/script_tests.cpp
-@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
-     ++data->eof;
- }
- 
-+#if defined(HAVE_CONSENSUS_LIB)
- static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
-     .ScriptBegin = script_tests_debugger_ScriptBegin,
-     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
-     .ScriptEOF = script_tests_debugger_ScriptEOF,
- };
-+#endif
- 
- void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
- {
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
deleted file mode 100644
index 60fc9d849054..000000000000
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile.test.include b/src/Makefile.test.include
-index 147add3eb5..308b1c88c0 100644
---- a/src/Makefile.test.include
-+++ b/src/Makefile.test.include
-@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
- 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
- 
- check-local:
-+if BUILD_BITCOIN_TX
- 	@echo "Running test/util/bitcoin-util-test.py..."
- 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
-+endif
- if EMBEDDED_LIBSECP256K1
- 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
- endif
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index c3c11c51b20d..f88446cdbbe8 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -13,11 +13,9 @@
 		<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="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
-		<flag name="tor">Enable automatic configuration of a Tor hidden service</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 9736b787f3b8..120378c9d0a7 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,13 +1,8 @@
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
 AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
-AUX bitcoind-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
-AUX bitcoind-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
-DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-EBUILD bitcoind-0.15.1.ebuild 5035 BLAKE2B c23995b5457256b33cbd726c8e7d5d840212ecac7450409d31e38bdc9589f3172c668ec4105d22435998c6118d0f85170f9cc133ccfa25bc1690b1417eb5aa4f SHA512 0d311093f9ff11ab9d795e7b6fc12ef477ff46964b4d94259f882da7fbcfab3a7252b0dc9bacda09fea96ebd5cca58b470464e8a220f66d511d8bc3ca224953b
 EBUILD bitcoind-0.16.3.ebuild 4845 BLAKE2B 6e974ad55e23ad07c81f03c841768be8df2967d18aab6cac73264c7ed812604aa5372bd7b06d97e7a40415cbcd346ddcb4181ae1d7224cdf4bf1092f781da7f5 SHA512 213152b613a69dadafc4d93e8eeb295cf652eed8eb058dfe7b6aaf84fe4e81623d75e29272c610ee335de8f520516a31b3e3042e44ccf9034aaae07a7c4819e1
 MISC metadata.xml 1033 BLAKE2B e79ed83740379df868320d024cf761995aac60ad9fcb451b137910814ce5b7964c8231853819c2b2ed95890f75c8ef18aee455eedd79543d8c44b2199124f0d0 SHA512 4e530a735d38119cc26b8fa31c2d4a117555004e79fad00f105f581ae6ba20d00d59d54f155c6e3f8c2bbe36aae745ff6e79a66187dac1975ec399e329d9a919
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
deleted file mode 100644
index c4ed72826f0c..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2010-2018 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="https://bitcoincore.org/ https://bitcoinknots.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-
-SRC_URI="
-	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
-	https://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="https://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)"
-	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
-
-	if use knots; then
-		eapply "$(KNOTS_PATCH f)"
-		eapply "$(KNOTS_PATCH branding)"
-		eapply "$(KNOTS_PATCH ts)"
-		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
-	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/bitcoind-0.15.1-test-build-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
deleted file mode 100644
index 3d953d9c0a94..000000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
-Author: Luke Dashjr <luke-jr+git@utopios.org>
-Date:   Tue Jan 23 03:37:10 2018 +0000
-
-    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
-
-diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
-index 7826cdc1b3..013846811b 100644
---- a/src/test/script_tests.cpp
-+++ b/src/test/script_tests.cpp
-@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
-     ++data->eof;
- }
- 
-+#if defined(HAVE_CONSENSUS_LIB)
- static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
-     .ScriptBegin = script_tests_debugger_ScriptBegin,
-     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
-     .ScriptEOF = script_tests_debugger_ScriptEOF,
- };
-+#endif
- 
- void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
- {
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
deleted file mode 100644
index 60fc9d849054..000000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile.test.include b/src/Makefile.test.include
-index 147add3eb5..308b1c88c0 100644
---- a/src/Makefile.test.include
-+++ b/src/Makefile.test.include
-@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
- 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
- 
- check-local:
-+if BUILD_BITCOIN_TX
- 	@echo "Running test/util/bitcoin-util-test.py..."
- 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
-+endif
- if EMBEDDED_LIBSECP256K1
- 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
- endif
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 86737484ab94..ed3d1bee223b 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,5 @@
 DIST gtk-gnutella-1.1.13.tar.xz 19207704 BLAKE2B 4a11fd3f8bd7554e78a75b51b818e2e863edc328d07d0da4fce07e9a6eca7307dd66082dc70caf96e9e85d1d68ee1ef253a47ffb58cc9f33358a5d71b10782cb SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0
+DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
 EBUILD gtk-gnutella-1.1.13.ebuild 1872 BLAKE2B c704f54e9224f327610f05cba33c2eba849179c4ccebae84e054469299b2eec1f26732b852fbcad67b50f5d33abb7146398e1449383d5710736352d8595c6986 SHA512 7a1455c3e35e8044d2954d555bd5728490d037c089a422199eb2a0754487bd56322b08dd0ec2ba3df1effccdc229d22ad6ee951ed1494e670db6cb56e1acb615
+EBUILD gtk-gnutella-1.1.14.ebuild 1897 BLAKE2B 8fbf26c1666183903caf86009b9b6d1510bfbe92a26017ed8e8dc084eab52bfe0be0b4446ad111af88c07d529a1b0cd36073b365cc6e8cbe2331b1c743b8862c SHA512 c344633b7a9c3071afc6722bca76ee0b1f488357121347119f57f3714b29e3c27f53884e7d8e5dbede9a7dfba0f0e2afd42b584589dcf5b047312f5009c26bf8
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
new file mode 100644
index 000000000000..7e55b5198d14
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# strip-linguas
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	default
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_compile() {
+	# Build system is not parallel-safe, bug 500760
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index c078ee73b869..03502c3c7e32 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -7,6 +7,7 @@ DIST xmr-stak-2.4.6.tar.gz 340081 BLAKE2B 10520af3e696632c938e753acc1bd3a0439b1f
 DIST xmr-stak-2.4.7.tar.gz 340026 BLAKE2B c6f898201ee744dea4aebf9bb3541efa7e5b78b740158c03ab044136eb8bdc768edb2118fa9f0eb48024aa70d52da7f281eb0443a42d4765bf3b7e39e98601fc SHA512 91557c88ec36cc96eaacfa71474a5d9e5ac8815904221bd588417b0b077cddef15c28bac62cadea8b7701ce87af8d8a43a911e6523a0bbad99577398e2f0056e
 DIST xmr-stak-2.5.0.tar.gz 356770 BLAKE2B faf4fe59b8038e3bdac8941a6bac8939e1244d258ea704df346252bb2b3dc9b82dc5cd3f57afda208253ddfa2be12256ff2d473729403f30c96aabc4ba9c0073 SHA512 11b59e4c11a75c9fdc500f835ce91584d71c128df1efe5170b4cf787897f729a38c4738bb20de52a78dd5d3506e31bb048f8b801cc73a6fefcc045ae0d94ee3d
 DIST xmr-stak-2.5.1.tar.gz 357295 BLAKE2B cbb91144f56abb3bb21d9b56d0e530847081698a90260e9e01f055138ff61a62e939e7546f359ac48afd3fb1d6b1bd7c10dc46c7ae628df02ec6d7a14e73f6dd SHA512 3899476430b50cf697588bce9b8b821c1cb6a5c4c24f0fa31c36030246a8092f6e3f959b8c0548fe26967d49cd0943843a53e49bf7420710382120292f1f2d2e
+DIST xmr-stak-2.5.2.tar.gz 357306 BLAKE2B 333011250d2df3a699ec00066b1f2e45182b33b74178579756fb29b553d1d8b5abc171241f9586ef80c2c34ada40fd350046b998a7ac3c6a905b78f5e00facb0 SHA512 d9c1e851588d7e995c11cd02873a49612f862550635afe311a654fb3e0f80c80dec15a99b83e33a6d090d6e32d87f29746291e06effa05df4fc9f2f78c0a6a9c
 EBUILD xmr-stak-2.4.3-r1.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.4.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-2.4.5-r1.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
@@ -15,5 +16,6 @@ EBUILD xmr-stak-2.4.6.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f5
 EBUILD xmr-stak-2.4.7.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
 EBUILD xmr-stak-2.5.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.5.1.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
+EBUILD xmr-stak-2.5.2.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.5.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.5.2.ebuild
new file mode 100644
index 000000000000..59442f8065c5
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.5.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	doinitd "${FILESDIR}"/${PN}
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}