gentoo resync : 28.04.2019

20 files changed, 285 insertions, 78 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 840c626b4535..b528606e2df0 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index cdc7eca72438..6b33504743e4 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -3,7 +3,7 @@ AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b
 DIST airdcpp-webclient-2.5.0.tar.gz 900078 BLAKE2B 53f5e096a3a6cc7c77c92bef32a7aaf0fb7b5e49740718252c7b4e233b80c52ca27029ba24fef4f1ab9c4c360da182accffb8ba7de27ef9b0b4aaa011005b689 SHA512 cf0220e3f2096304e393a4bd833e81c1427dbd144a56498712c9e18f2ec14f35d9112ad0ff05f54aad5a57126d68fc46c2bf20806dd7464a5bdb301543b08809
 DIST airdcpp-webclient-2.5.1.tar.gz 898980 BLAKE2B a930a13d34068977d0184ea56163cb9ae0f47bd92cfb724145f287742fb034ebc89f0a55fc5b07a8761de0749d3725912d4f4682542ac60c93b003a08ed24c9f SHA512 297aa780ecc35f48000eba1cc3b6f284a64954fbcc257ed58c84f2c88901b1c01c17228883c6569fa1333f0e41067f9fe7623ef24e458844544f6d6cc2b45c4c
 DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
-EBUILD airdcpp-webclient-2.5.0.ebuild 1439 BLAKE2B 39eb81610030ca0ca4158842ec9c42fdd745924a4daf8b4967d477e021d8560e2cae400343b0f4ccff1eabc343eb2e1e6977b43a11774f1efb1a6e8a00155a96 SHA512 21193dd5317f7185151090f2559e0d8bd0b6b6950be16b3ad60648706bec5c0c4c4f552baa217ccbbf4e42f6cc4d31f7ef5aa6ff15fdee93fc20556b47d29b1e
-EBUILD airdcpp-webclient-2.5.1.ebuild 1439 BLAKE2B 449772fdef496874781fcd7849bd27313ce26b740306f464928c4b51eb9a21cc4a006f85f473408799aae1316e5c9f9d2842ec7cb15ecb9865bc0cf0cdd4ba38 SHA512 45cd923260b9294e60fe8cd9447ce9158d366dafcff0200253cb308589d83450d94f3f989e073b24c3f01bcc411964a11903aacdaa56a798599ef294a4e2c8bd
-EBUILD airdcpp-webclient-2.6.0.ebuild 1439 BLAKE2B 449772fdef496874781fcd7849bd27313ce26b740306f464928c4b51eb9a21cc4a006f85f473408799aae1316e5c9f9d2842ec7cb15ecb9865bc0cf0cdd4ba38 SHA512 45cd923260b9294e60fe8cd9447ce9158d366dafcff0200253cb308589d83450d94f3f989e073b24c3f01bcc411964a11903aacdaa56a798599ef294a4e2c8bd
+EBUILD airdcpp-webclient-2.5.0.ebuild 1437 BLAKE2B e0450bcb8ad7cac245fb7a38f9bf124321b57ed4185558e7b0e1c9232dd5e94d36c6b937be183ddfde043e902f7eb93a107bec65b2833f8cc0b3c29aba3e9542 SHA512 9fba8e23a2266b16f4b88437669b8efce51f741998cdd184ba9ed4d64876ba1f7f0ade9dcc5c5803e2760e4ffea86383891a4a5c43ae4bba9d8b135d7e209c43
+EBUILD airdcpp-webclient-2.5.1.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
+EBUILD airdcpp-webclient-2.6.0.ebuild 1437 BLAKE2B 82d3e693e68b9c85e4b3c7864d3448b19a76f59060934a23c0a0cd99cf2dee2b5242ad3c45e91b016f5fb46d98e708dd0e28b4ff5a8c01acdbc991b99794cca3 SHA512 5bdce912f57bde5f91368102a41d5527369c65ba3a47c953dbe9471998b45036893c1f2ab68435e29d21921f9e4d16e6939b2d578a6643382d6506da528170e7
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
index 0a48a02f89a5..8d45254e2be0 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild
index 6e5120d6044e..647a9600c515 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
index 6e5120d6044e..647a9600c515 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index 9640d4a6ff0a..912d232d830b 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,14 +1,14 @@
-AUX amule-2.2.6-fallocate.diff 687 BLAKE2B c7c7df787b417e58db50c59192eb455c495ecd38f9fd5f547ff3db6cfa642eba323f4ade99c66fe981777479a728afb9e12e1ae494853af8bbb4634448820dcd SHA512 406eb05eecfa7d027f7eaeefa2ead92078d5f7ed0e72f3ce47ac4f1f23b2852577f429f999a009198515e35efacfa6e54283494bb3eaf6332ee6bed9963c65ba
 AUX amule-2.3.2-cryptopp-6.patch 927 BLAKE2B 3be08b8219cebdaf252f21dd4a7e469d0371aa62a5ed9856c13d8772163c8f85cb7f19d9cf383e226276852c7acbb73ffdcc4f46a3e23118491154ddd47ca1da SHA512 fe07cdddf447d327ac517366449ec329d81f49ef327183eac36aca522db244732713837ac8c4d4ca0d92d648bd96dad670597b466e375324204427a381bc2b26
 AUX amule-2.3.2-disable-version-check.patch 419 BLAKE2B e4ca791348ba80eb34cb876fe05c2b85a70e2d704ecb3dd14ec6fc47550d4a677fcdd071906b93c56652c133462d5065b5907564e91c092430e310e2dd8c2523 SHA512 6d98c1a78b16778ad94ef9d70e87fe7ded2228b101bdb961565c3f2a0f2687e55c97bd824e331b53cbd45fbafbfa5803ce4c2f1fa8e245a3ebc97cdd7f282b65
 AUX amule-2.3.2-fix-crash-closing-last-search-tab-1.patch 3620 BLAKE2B f6dbba7491472d1c15f2253ea94cb83681c4f745f6cbe8662d95daaa54f69ff3eee94e02a1d5d5d69cf303c55db5cfef630096750b6bfcc431d48e120cfca91f SHA512 752f2dc7590001d830da2aa211349a2e04601c76ab01620f741e57f8c7a05851e1a4a4cba2ec88167b8c8047b8c3bca1a120003ec85c1155d6b8e71bff05f42c
 AUX amule-2.3.2-fix-crash-closing-last-search-tab-2.patch 5073 BLAKE2B a90260842bbadae7ea2f068a2c4fb94d3024e61ff0eecf340257fbbdb7657a7946aed36b8bdfe3f5a5c06852be55d144909f74cdb01761fb0e167c67ea4c0fc6 SHA512 8227cbb72af28a076e03dec466fb53660985de33fd84ef8856b6d098035015bc4e9c4d5a3da5a320053525d0356f3a73f2fe0b9f1c1eb7991b29bc4e1e93751f
 AUX amule-2.3.2-fix-crash-shared-dir-utf8.patch 2204 BLAKE2B 3266ef16038176af0e3cef9e8a16517a34f78723e725c453e557f88fac3b8b233edb34aa10b3295563a769df3fc9a1c0ef88cf2eaf5b43a5bd2d60f4b4a09757 SHA512 f0ae3e7e8ee4105c4999d248f58ad946db7c163f6f2fa1ee54f97509d82cf43cbadffcd537d728f2dc547cbe83deaa8737e794d42a773707b2fe85d6a671b4e1
+AUX amule-2.3.2-fix-crash-when-shared-files-changed.patch 1648 BLAKE2B f3bf70c65b374d468935f8b2f32519bbda66bb49387a81727fd52efaa15156bc0a8a5cb49ba8bbcfa212c7ec79b8b141e27e318bee95ceb8f37e35cdd98b2988 SHA512 748d8746e01d2aeefe7084030db190302c71b57c97fa438fc958d5fe7eb415b2b624f04f6bb436ca612731061b863f9251bbd81a10e87d8acc0f9ff5fc948b7e
 AUX amuled.confd 300 BLAKE2B 891cf5d274eb10a23b5b43200d861b5e4361b9c0a11acd020542ff1f0d7d96725b113fb6d74ab34c56d408311582d8524f7bb8f77d1255f3e374abe3b9f34a8b SHA512 88a3fcc64ed4c4729609e3ffef098d4bf30bda0d17b5165fff3417161c18766df79de11c98ee510677291bca7ded33d2a23d3aff0d99781f98173cc189f44901
 AUX amuled.initd 1105 BLAKE2B 16525a9c5ad8c158d0d4f1ba316fb493cb438b985a0a4d52672b4067acdfae6dd4897d7c37459515ce4a0e6b0b89665b9feaea6b15e3535c8f46b83ce0c16d05 SHA512 3ec351e84da4e33918747de4ccd9ec86895b60f9d94836fc92112489edcfe14af7a21efb79194b80bb81aa666714bd5a21873c954b36948e31369727e71143b6
 AUX amuleweb.confd 720 BLAKE2B 1bcb4349f34c8deef069d156da29ff3dcb642f9b5c15fbef742d0154ff6580142fa2c2c797a3864cd398c980c1e2b2eb41f2c958c6f356f3077e79de47fe7610 SHA512 ba760e45002a80bb55e2729178d0901f885e8d142903f8eb98a31b8544bf6989801dabfa0315e0d1f7d8bfa3df5716cce43bf415f45a4605895dc2907716ca41
 AUX amuleweb.initd 1149 BLAKE2B ef29bae12cf72764798eecb6866405525b601ee6ea869b6191954799805f47b75976884ee566ecb03eca907b3b13ff7870541b7682a70d5db058fb1257d6f00d SHA512 4cc944af90ad81f09d74d79dede57d1ff26c1b87649432d14ed294770b04f6ea256c25c194edfdc8f9d0c85929b1c576c31eba9228703e5a21259d83968289b0
 DIST aMule-2.3.2.tar.xz 3895300 BLAKE2B cf1bce3a0fcd0c108e369b7aed257f067a4ce3ce2fd4e8509b577ac58f8bc52fbc9aabc5c703bc9111dd06ac011ee1f3756279b093b69bcaada106226493237a SHA512 3064b086f8459b4372ea0c11f239a08167c7beac3dde26889f056f617b480b487bea10c2cae8fdfa1ae99c10fc9e715adc8e01e4b968389861aa47c3ec8c0016
-EBUILD amule-2.3.2-r1.ebuild 2264 BLAKE2B ffa5219b33d63414838be657972556be4122717478698053454e3a7da290a5f174e6730e52b3ff05305b7010821a0588ca2ab092d28c9e0daae19e83d0f6043a SHA512 defd04e15bc4d77fe48a78999dac8410228199029011bba8ecf295388354029bf43a1f17741696c65b36acc90dea0e4b5c47ebbcbab5111d4eb95a84949179fc
 EBUILD amule-2.3.2-r2.ebuild 2339 BLAKE2B 16698d20edb786d3a1be426c65a89c53d3127dca0b6b0ce38adff0d37bf03ac2cb428f30935f75fd99ef62ba1f900a30c8e7eec3ae79a088885b74c26638dce7 SHA512 490dec5064d9e560626931616e4c9d9188f68815cc477df4ea39a4ff4a82af25f5ceea12a223c7b5188c8e661990a960534bffeca35ce97afb402713b5e1029c
+EBUILD amule-2.3.2-r3.ebuild 2409 BLAKE2B 9b6c0d8bfd0a5b9be5dae5ea88fb13f2209b8be7cb0f28e8503ad3ec8500e89ee446876c025ce4c1c9664c401cdaa9133a832a737d1923de7589b7c93352cd85 SHA512 ad6380175c73b4f53751a28eefbfe4b6623e2d68bbfdeb1b6d08657c29c637b664bd6acd9073b2b945a9c27e75fb65c481c6e87a96a2bb418c751908fa0e5e3b
 MISC metadata.xml 636 BLAKE2B 3384c1c34c9963570b17793188db257a5c0648390aaa8ca73f4bad50db8b54be9d0fe5d379b873fd0f21bf6ecaeaf5840ca65ad92c72a1449b25035f9b7ee3c3 SHA512 bd93ef13a5d116f81c8a6901e524032a85eab90589067e57e165f643f8f0a75047869801b4485fa47a0bc41008f3b8f1aff1aa8b413c83b4c27610ef6ea58d5f
diff --git a/net-p2p/amule/amule-2.3.2-r1.ebuild b/net-p2p/amule/amule-2.3.2-r3.ebuild
index 51bb5d2472b5..7a7035ef43eb 100644
--- a/net-p2p/amule/amule-2.3.2-r1.ebuild
+++ b/net-p2p/amule/amule-2.3.2-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 
 inherit wxwidgets user
 
@@ -15,24 +15,31 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 ~sparc x86"
-IUSE="daemon debug geoip nls remote stats unicode upnp +X"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats upnp +X"
 
 COMMON_DEPEND="
-	dev-libs/crypto++
+	dev-libs/boost:=
+	dev-libs/crypto++:=
 	sys-libs/binutils-libs:0=
 	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X?]
 	stats? ( media-libs/gd:=[jpeg,png] )
 	geoip? ( dev-libs/geoip )
 	upnp? ( net-libs/libupnp:* )
-	remote? ( media-libs/libpng:0=
-	unicode? ( media-libs/gd:= ) )
+	remote? ( media-libs/libpng:0= )
 	!net-p2p/imule"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2.2.6-fallocate.diff" )
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
+	"${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
+	"${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
+	"${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
+	"${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+	"${FILESDIR}/${PN}-2.3.2-fix-crash-when-shared-files-changed.patch"
+)
 
 pkg_setup() {
 	if use stats && ! use X; then
@@ -40,6 +47,8 @@ pkg_setup() {
 		einfo "to compile aMule Statistics GUI."
 		einfo "I will now compile console versions only."
 	fi
+
+	setup-wxwidgets
 }
 
 pkg_preinst() {
@@ -53,32 +62,25 @@ src_configure() {
 	local myconf
 
 	if use X; then
-		einfo "wxGTK with X support will be used"
-		need-wxwidgets unicode
-	else
-		einfo "wxGTK without X support will be used"
-		need-wxwidgets base-unicode
-	fi
-
-	if use X ; then
-		use stats && myconf="${myconf}
-			--enable-wxcas
-			--enable-alc"
-		use remote && myconf="${myconf}
-			--enable-amule-gui"
+		myconf="
+			$(use_enable remote amule-gui)
+			$(use_enable stats alc)
+			$(use_enable stats wxcas)
+		"
 	else
 		myconf="
 			--disable-monolithic
 			--disable-amule-gui
+			--disable-alc
 			--disable-wxcas
-			--disable-alc"
+		"
 	fi
 
 	econf \
 		--with-denoise-level=0 \
 		--with-wx-config="${WX_CONFIG}" \
 		--enable-amulecmd \
-		--without-boost \
+		--with-boost \
 		$(use_enable debug) \
 		$(use_enable daemon amule-daemon) \
 		$(use_enable geoip) \
diff --git a/net-p2p/amule/files/amule-2.2.6-fallocate.diff b/net-p2p/amule/files/amule-2.2.6-fallocate.diff
deleted file mode 100644
index 8d1485a67786..000000000000
--- a/net-p2p/amule/files/amule-2.2.6-fallocate.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Disable fallocate #562992
-
-This is only a workaround to fix FTBFS, the configure check is wrong and needs to be fixed:
-http://www.amule.org/abugs/view.php?id=1572
-
---- a/src/ThreadTasks.cpp
-+++ b/src/ThreadTasks.cpp
-@@ -506,6 +506,15 @@ void CCompletionTask::OnExit()
- #include <stdlib.h>
- #include <errno.h>
- 
-+// #562992
-+#if defined(__alpha__) || defined(__hppa__)
-+#undef HAVE_FALLOCATE
-+#endif
-+
-+#if defined(__hppa__)
-+#undef HAVE_SYS_FALLOCATE
-+#endif
-+
- CAllocateFileTask::CAllocateFileTask(CPartFile *file, bool pause)
- 	// GetPrintable is used to improve the readability of the log.
- 	: CThreadTask(wxT("Allocating"), file->GetFullName().RemoveExt().GetPrintable(), ETP_High),
diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch
new file mode 100644
index 000000000000..81e0ef7b6296
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-when-shared-files-changed.patch
@@ -0,0 +1,50 @@
+From 110a056fa4bcfc0fe8c1f8eadcc2bd5df0bbf5e1 Mon Sep 17 00:00:00 2001
+From: xinhuang <xinhuang.abc@gmail.com>
+Date: Thu, 4 Jan 2018 00:44:35 -0800
+Subject: [PATCH] fix crash when shared files changed on Shared files tab
+
+---
+ src/extern/wxWidgets/listctrl.cpp | 10 ----------
+ src/extern/wxWidgets/listctrl.h   |  5 -----
+ 2 files changed, 15 deletions(-)
+
+diff --git a/src/extern/wxWidgets/listctrl.cpp b/src/extern/wxWidgets/listctrl.cpp
+index 18a30f205..460700691 100644
+--- a/src/extern/wxWidgets/listctrl.cpp
++++ b/src/extern/wxWidgets/listctrl.cpp
+@@ -5803,16 +5803,6 @@ bool wxGenericListCtrl::DoPopupMenu( wxMenu *menu, int x, int y )
+ #endif
+ }
+ 
+-void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
+-{
+-    m_mainWin->DoClientToScreen(x, y);
+-}
+-
+-void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
+-{
+-    m_mainWin->DoScreenToClient(x, y);
+-}
+-
+ void wxGenericListCtrl::SetFocus()
+ {
+     // The test in window.cpp fails as we are a composite
+diff --git a/src/extern/wxWidgets/listctrl.h b/src/extern/wxWidgets/listctrl.h
+index b18a61866..e72f7eaf0 100644
+--- a/src/extern/wxWidgets/listctrl.h
++++ b/src/extern/wxWidgets/listctrl.h
+@@ -232,11 +232,6 @@ public:
+ protected:
+     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+ 
+-    // take into account the coordinates difference between the container
+-    // window and the list control window itself here
+-    virtual void DoClientToScreen( int *x, int *y ) const;
+-    virtual void DoScreenToClient( int *x, int *y ) const;
+-
+     virtual wxSize DoGetBestSize() const;
+ 
+     // return the text for the given column of the given item
+-- 
+2.21.0
+
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 658c18f4f1f3..68432d1efce6 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -4,5 +4,5 @@ AUX bttrack.rc 519 BLAKE2B 829b1a4cdb29bae41e25e832d7383ea4fda3ec2473d6d9bebc273
 DIST BitTornado-0.3.18.tar.gz 189227 BLAKE2B 96a273c6f1072a19a0853cb0f0c16165432670927588f3422e680580e7d31a76b1b06b8e8a806676eb2f0cdfe0d4c785c389f07cb7a4690feb57cbac9c45c28f SHA512 61a55726d93ddb245e18e47f41dea982b8faa7d3296c3a7221d00e0fe71db772613c3ee113bb7df18390807dda8c77859ed7159a03535446ca417a1344e3c0d6
 DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014 SHA512 09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa
 EBUILD bittornado-0.3.18-r4.ebuild 1461 BLAKE2B afa872014cbfcb74cfe6ddaebe18ff84bfce28c9a9acc6bb5f27b3d21b3d2e1f85a5fa5ae3baa953bd191adbab6767269ce050cc66c913b95b7991f6e6b7b8c5 SHA512 e5433975438df2ae576ad557195dcfe3bc1ff3fb92925763d6c464a3703f699d6d8554bd46a5b79a41d80f2d82ddd7e32b8c8554e8377fba0cd8b15a213ed93f
-EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1286 BLAKE2B 66a0dadc4aebd063d793fb3f1b75061e9006f2ff2d95f7f38950b4b9a088572d5bb51e135b6fda4b49efb51ca987eaea8f4beb2e9b22352af2f4662bb53387a4 SHA512 9c3942a797c01373d35c1d922d2afecf555fae767d58703697c5700268025503555ca9fefe2fd87d508bd853fad5f5b535d65ed6f98e604bfd59184b9fc44d7b
+EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1281 BLAKE2B 8d94b3037f63028c02573ced25f10cfdb858a8bcaf35f082c5e4bb33d77099632b92eb0ccfdec77fb674e0a80b34125220ab4993649d718f2a057229357cfdb8 SHA512 32b17c700e9e8535da36dfdcbb401a80fc3866d7878b7ea7e66a8f82ad525c8b376ab3a9b4d84c04ada9ea7c4fe3d80533fa771df63935ca96a8f6d455ed7660
 MISC metadata.xml 302 BLAKE2B dee7f2a91d0302a9476d974057446af53bcd7cc74269dde75af61e5d6f824c697b0feadd4014c262ac4350511f797a60db656f45981d037125f0926f6bac569e SHA512 a2ed81559aad97406f1099fba266a7a2fa9d97013f267cfc9df5139ebde26495f103f1118fc0b2af825e281b026c434d11300e545aef9eed07b65eb504b47e67
diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
index c5dcbd5245bf..f745bef28bbf 100644
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index f0c957b92c39..c7c0827cf108 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -3,12 +3,17 @@ AUX ipfs.init 464 BLAKE2B f5927ab792427a87c330772fca4adc177ae84899be5c6b856f763d
 AUX ipfs.service 245 BLAKE2B b2d528a82a79d1e7fd5cfedac1a4db2412e7e02c87c3e5e902b0bd1a9259fd4156328b8c289df42a898a64a396d83ef93f24743d042b4fe24a2d97f8f0c5235e SHA512 58e21b8c7a7c0af0b05ee936fcd7e8e61903755f1c124a4d59758bb094d520d3dafb9b5b8b92d2a4b414367fbdaf2ec0025c05cbc796d0ee26f2916d12dde472
 DIST go-ipfs-bin-0.4.18.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs-bin-0.4.19.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
+DIST go-ipfs-bin-0.4.20.bash 20753 BLAKE2B c34d29a48cf249b7a646a8a7b6015b9c4a4a5d8656187ec5984b0dfb741a8ca7b2f2d0a10bc0288aa862679c6d52145936b46497936565ba7cdb2ba847fda5b8 SHA512 acd3bdb689964aa5e15965bfea3cd1267f54a2014c05f49f4e536902cbdab3e22038f4f5db5ecc273c147135b265fcb82a41db22bfc3fd8f6ddc8ae43fd053ea
 DIST go-ipfs_v0.4.18_linux-386.tar.gz 11128726 BLAKE2B 2f1289bb0aa93d0d03585bb90f577f91c8db922ba7905aab90c6e6b7804b7fab5c52b861aa0cdd927de8ea0b6e20f22f1c42c390628cd2e660fbaecd55b04d24 SHA512 7fff0da87827dcef7c84f959f4cfdc0b5e43e82c636b77fd600d4f62d7b78b8f1660ea346caa5eaf2d791ab275f41c0f83d606e4b36f29f3284a1851a82fbce5
 DIST go-ipfs_v0.4.18_linux-amd64.tar.gz 13791729 BLAKE2B 777d20792d089216010574798245e0eac0a5ec46549aef3ec4162c289d1d4fec1b381d8fba39ad2a57d88fcbeee5cdd1bd8509fa8883dd946fb452c4266f95de SHA512 ef5b44a0aaed604890c83322ca02228061204085b87b20dd173edfe6b6631fc7a54724d2e00202488c86886992a0d409f43e09f022cdf8b1138f8419cf7614b0
 DIST go-ipfs_v0.4.18_linux-arm.tar.gz 10933477 BLAKE2B b846926b33c78a6d089717689993c6a9c9b6ae03b32f184c2a74ecc1a9c290e7b29a9e35f2e7691e504e86c6f6229d86bbf956d90d939decb91a22fe04f74504 SHA512 c60cf427109c9c08a73a8270fe9d2792932894cfd68c1a90ec159733d121c5c12647e4b8ab2ed24865c9a4b7f8cb94db9dbe47667e48b5525b39f0c3a0acf085
 DIST go-ipfs_v0.4.19_linux-386.tar.gz 11313754 BLAKE2B ac45961d7af003b28668c208be8e5d4457f28284a9b2ce21d9958a52204212fa08c4a8077382913027b0e79cfd8a230227494ca7897d25ee4900f9747039d6af SHA512 9fc7b467098613786788d41c04257b119d124a03279439c16c6a541d5057ce769b295eae16a42b10561f42f5eb982221dc2beacec42d56e517566115e72124da
 DIST go-ipfs_v0.4.19_linux-amd64.tar.gz 14068171 BLAKE2B e108fcbeeca0823a90df049c870501406ec68d5750d300d5e50fb8f8b2e8c3a1cbdceecc76687cfa9ca0185e7661ad5fb91bf0f33cdef1e1e7c4fc5e0c25dd6c SHA512 66d930bef0196c70f25cb207c00da6e36f6c2c17ff0e785f45d360e710502c233aeeeaaa5ee0bfc984919d42225c74c6474e5e5ce5c8cd6993580903fa8ec0c4
 DIST go-ipfs_v0.4.19_linux-arm.tar.gz 11118746 BLAKE2B 08ea24e8367d22577798636faec3ecdacb2dad9dd635f727a129b875ab02d1b37712b20ce6a387046a7be753032b437aa1feb8fab79aff99140c543652f3d7c6 SHA512 00084c0ecdf2d78e792519dbfcc7f62897283d5d81e7df90745ac41091dabaf44674a62c0ebc6a63bfea9bed97f98ed1dde260d8eb05f4bef2f4d35d3ebe9f5b
+DIST go-ipfs_v0.4.20_linux-386.tar.gz 18312554 BLAKE2B 0da4c23635f4451f4a4156f492fb380a538108b1dd834bbfb35ae1d77543e3d2fb9823431228c5cf6fe6aa6318062dcc4c22e4e3c8775c16ac2b5e876ecfafe3 SHA512 675ab88affa3871ea6ca9cf14150f6ad262ca1c7120ab2dbf15259693754f5372de3958ae9265ac800b21e53f495356dc45f1a67fb01548468dabb6e5d8befd4
+DIST go-ipfs_v0.4.20_linux-amd64.tar.gz 20120151 BLAKE2B 3e363fbf244d4d848dbf5e0e13a78804401ea1b3b205683e8ea6d8b2409557b0575bb23149013ebac231523bb7f6278220715f8e20032d0bbb7a420f94e664b5 SHA512 a8a2ec9c04a7aec576f8b86997d5310b77eca2b78df9c269ac9ef478d786277550f09e410e392ede333eb652e8ed136bb58a22f2b3198c94a61649c7a5525b68
+DIST go-ipfs_v0.4.20_linux-arm.tar.gz 17668228 BLAKE2B f900ecdbc580e86a476d1d5d64fa54be7856429a33b9fc98d8d8141431be0df2776726c64d81218903c51f648f1ab5256d23daf82e260f4e714c7e4bb169380f SHA512 feb608db7fc9750ca155d008992a93bb5e9e1f53504d224aeb474465c5811ada182770c4a5465331f9d6b2c3472201bb53a1243c0de844f94db4751569db3021
 EBUILD go-ipfs-bin-0.4.18.ebuild 1284 BLAKE2B 03fee910022a804913d3adb50beaa93cae9d14d12a73157c125561bd0b42b6ecd8c40391b517e9bb2233513ead6903781cb8733c4d2b524f82399dd159afbc2d SHA512 14291ab9b9bacb9b9ce40e943ac3be80a69bdfa8d59bfcd2bd5ee2902c07acc28351f582105b358aea7134b4edb61c346225c771906110394509fc111cb45956
 EBUILD go-ipfs-bin-0.4.19.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
+EBUILD go-ipfs-bin-0.4.20.ebuild 1284 BLAKE2B b352def2375a823e31a688afcf169ba7ce81c7b00af076c24e811364db45ee23d10f0aa31df129492ee9938fb39f1b39c7ee0ed6c1c99f310758122796d99e7e SHA512 d35216cd49fbca3e778d39748012b0a7d27783a888707ebe53355debaebe36a1d42adf0631f3599dc5dcc76a51910c82c9b0e89daa0ec3cfbdb1c6001622c778
 MISC metadata.xml 514 BLAKE2B fb8cdd1bd3a7e9f4ee567d126e9a2e78c1a7e3237a13f831f0edd775d1ff5ebaab94d2bdfbd764fb32bc52d4fdd65a21e37af369efd6e2a9f932bbe2fa113256 SHA512 46e23df18c12c87434db22e3a22ebc9a9df8650b6a8235f655ee6e4657e706fd86dc468462a485483eb9ea440f38d40e262a3537cceb41eb1e68110651ba5d00
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild
new file mode 100644
index 000000000000..d19ef9ab7104
--- /dev/null
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.20.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 systemd user
+
+DESCRIPTION="Main implementation of IPFS"
+HOMEPAGE="https://ipfs.io/"
+SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
+	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
+	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
+
+	https://raw.githubusercontent.com/ipfs/go-ipfs/v${PV}/misc/completion/ipfs-completion.bash -> ${P}.bash"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+
+RDEPEND="sys-fs/fuse"
+S="${WORKDIR}/go-ipfs"
+
+QA_PREBUILT="/usr/bin/ipfs"
+
+src_install() {
+	dobin ipfs
+
+	systemd_dounit "${FILESDIR}/ipfs.service"
+	newinitd "${FILESDIR}/ipfs.init" ipfs
+	newconfd "${FILESDIR}/ipfs.confd" ipfs
+
+	newbashcomp "${DISTDIR}/${P}.bash" "ipfs"
+	keepdir /var/log/ipfs
+}
+
+pkg_preinst() {
+	enewgroup ipfs
+	enewuser ipfs "" "" /var/lib/ipfs ipfs
+
+	fowners -R ipfs:ipfs /var/log/ipfs
+}
+
+pkg_postinst() {
+	elog 'To be able to use the ipfs service you will need to create the ipfs repository'
+	elog '(eg: su -s /bin/sh -c "ipfs init -e" ipfs)'
+	elog 'or change IPFS_PATH of /etc/conf.d/ipfs with another with proper permissions.'
+}
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 7b03ca2acac6..05537ab7b526 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,4 +1,7 @@
+AUX ncdc-1.21-tinfo.patch 1502 BLAKE2B c7194f78dbf410ee5a3886277b472792808279fab2f957ea8dd8783b91f1520f20eea19acf3a302b59214de186e695852d370b4733bccc36f77febcc66914371 SHA512 1f66c98230d56331782c592ec61b55aa66ae375de1d2a6b6fee3449ac8ff07b9d2d55af01c8fd72848cfe166fba306bbd836ee7fceb743142e63520f9a09f6d4
 DIST ncdc-1.20.tar.gz 367688 BLAKE2B 33bf6cd92146b0cf3d188cec4b5c29f0860f91cbdf7a1ab33789985a61b706647591513fb596f89b21d3d8aebf683316397b94f184aac928a93e23fc17030e82 SHA512 0f20d6584aab1e69bcb3a93271a8542c5968adee5fd198b375dc258996b60ee5f642eac5d5e91c5513e367bbfd42eda80ede9e6e93ab38279c33e8da557010a7
+DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
 EBUILD ncdc-1.20.ebuild 644 BLAKE2B 22e5a3c7f3116a937729866cb2f8ee4ad56a53018fdc5bfc61e5f029efc2215510667d22dc3a4bf803fdec390f09f8f6e690e27cf1a3cdfa60e077bd3b045c32 SHA512 16ef83bb091cf2a2573f167d127294956de168817158eba3f294eb7e73c9e5ad27b04f1093f02197a58df5d70c0f418f845ba7c6b8325566c61c81f5428c4a1e
-EBUILD ncdc-9999.ebuild 696 BLAKE2B 8fa87cdbb1ffc14650b8fa57a679460630e92f3d7061f0f12a48c0fd5ccdccddf58a1a19de94dd6dc0c2ec0d57996e2ba7b8fccf213d86c2ffd83de2903d3b00 SHA512 2198381e38d5da4d2c5fdc3382144ca341319fc72a643e8b66dca7f8dc470d1a5cfda7ecc453e235145a6dde8ee85803a4559b3adfb98b8e53938154ecf8a1c6
+EBUILD ncdc-1.21.ebuild 991 BLAKE2B fbccb8063b09ca956e12dd89f8d642a1e4aa58f4a0d018b7dca2730e142b1fd32219f9ff1328dbe4973d9cb8de080659d00c960dcafb0d007514c954231c16dd SHA512 5da89188c1a0b18fa26d42a812e329679e2f7dfad145ec3b8acb325c180a710bc702a0980e33192f879aa75a296f0cab982ba4216c384a44700aef7c57d342e5
+EBUILD ncdc-9999.ebuild 966 BLAKE2B 4fce5eee7d24912f13e7be774510c3749d785fa00185993af6650bc6b6daf0cc66d190e89a3c7755efab1c8772c1c54940f7410d5744258601091ba66f858497 SHA512 b9d18ecd8b8212abbac6a5bc2777f1a57075dd1458a0d6fe69e79c9acd6f5829ba137126c9b375a28f8ed27238f98d454c4e26e62d154a2efdce4b9e535331a6
 MISC metadata.xml 458 BLAKE2B b26f2357e1b243dd7425edb1ac7a7bd3fa253a713e969c6f7387e79b24f4a31b7105920f0552437c48d33ebac806ddd5f1d3ec44fa21a500254ba1e33505c828 SHA512 737260611d6d3a7562eefd1ad477616572d1ce6b5bc2ab67b0685c7c8c09efd0f274da5576eec24fa714547b062232d7030e3d946bfaa94fd9db7eae271976c1
diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
new file mode 100644
index 000000000000..0e5acac59d50
--- /dev/null
+++ b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
@@ -0,0 +1,53 @@
+From 16466392884a623fd93907f4d1071211e8ba48a4 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 8 Apr 2019 13:58:42 +0200
+Subject: [PATCH] Fix build against ncurses with separate libtinfo
+
+by using PKG_CHECK_MODULES instead of AC_CHECK_LIB
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c774316..d0c0430 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,12 +30,6 @@ AM_CONDITIONAL([HAVE_MH], [test "x$have_mh" = "xyes"])
+ # Check for header files.
+ AC_CHECK_HEADERS([zlib.h bzlib.h],[], AC_MSG_ERROR([Required header file not found]))
+ 
+-have_nch=no
+-AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h],[have_nch=yes])
+-if test "x$have_nch" = "xno"; then
+-  AC_MSG_ERROR([Could not find a header files for ncurses.])
+-fi
+-
+ 
+ # Check for posix_fadvise()
+ AC_CHECK_FUNCS([posix_fadvise])
+@@ -95,15 +89,11 @@ esac
+ 
+ 
+ # Check for ncurses
+-AC_CHECK_LIB([ncursesw], [get_wch], [
+-    AC_SUBST([NCURSES_LIBS],[-lncursesw])
+-  ], [
+-    AC_CHECK_LIB([ncurses],
+-                 [get_wch],
+-                 [AC_SUBST([NCURSES_LIBS],[-lncurses])],
+-                 [AC_MSG_ERROR(ncursesw library is required)])
+-  ]
+-)
++PKG_CHECK_MODULES(NCURSES, ncursesw,,[
++    PKG_CHECK_MODULES(NCURSES, ncurses,,[
++	AC_MSG_ERROR(ncurses library is required)
++    ])
++])
+ 
+ # Check for zlib
+ AC_CHECK_LIB([z],
+-- 
+2.21.0
+
diff --git a/net-p2p/ncdc/ncdc-1.21.ebuild b/net-p2p/ncdc/ncdc-1.21.ebuild
new file mode 100644
index 000000000000..ee8caa14759b
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="ncurses directconnect client"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+else
+	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="geoip"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=[unicode]
+	sys-libs/zlib:=
+	geoip? ( dev-libs/geoip )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/makeheaders
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.21-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with geoip)
+	)
+	if [[ "${PV}" == *9999 ]] ; then
+		myeconfargs+=( --enable-git-version )
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index 5759853e51ac..182aac603d70 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-9999.ebuild
@@ -1,38 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools git-r3 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
 HOMEPAGE="https://dev.yorhel.nl/ncdc"
-EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+else
+	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="geoip"
 
-RDEPEND="app-arch/bzip2
+RDEPEND="
+	app-arch/bzip2
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	net-libs/gnutls
-	sys-libs/ncurses:0[unicode]
-	sys-libs/zlib
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=[unicode]
+	sys-libs/zlib:=
 	geoip? ( dev-libs/geoip )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/makeheaders
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
-	eautoreconf
+	[[ "${PV}" == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf --enable-git-version \
+	local myeconfargs=(
 		$(use_with geoip)
+	)
+	if [[ "${PV}" == *9999 ]] ; then
+		myeconfargs+=( --enable-git-version )
+	fi
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index 1d77aff75c0e..8dea0f94c5c3 100644
--- a/net-p2p/torrentinfo/Manifest
+++ b/net-p2p/torrentinfo/Manifest
@@ -1,5 +1,5 @@
 AUX torrentinfo-1.8.6-fix-tests.patch 934 BLAKE2B 6204fd3d04f7c8ddd4f4e9b9c64683003a4eb19f06fe5d7b7f76d3cdcb356b279ca4ac2d226080422f7bf98711d591b6b054d25539f3aa4096ad25ba970d6ef8 SHA512 d878048fe01bea0260f6b3045e77f88a6fb94ed11e15996fa3389119d8315657f77d2434d2c67b3ab58c83d4741f11c22723f0e9abbd06f4ab0df82cffc1b064
 DIST torrentinfo-1.8.6.tar.gz 22232 BLAKE2B 04159e4e54fbe979a1a73e1dee39c9b7f9def389c44e3886fd28707646a2bc4c6a4dfadd5494ef9283427959da1c36260828693a0008e09993786d8639813bcf SHA512 7f36f6c80876cbd70ea9e1331195c8a30a6546406f345402d4bec5c58afb9b03a3b60189b8d177a63a7047c3ede7fc18d8fc47ecb1bcbb726dd01b7cb2a6efb2
-EBUILD torrentinfo-1.8.6-r1.ebuild 649 BLAKE2B 7ad6bb78cc377579cd02c61ed4d2817add13a7277b20aa418412a05501b86aaf5bde5c7705a299fc6a9aa61b1ee2f983242a34f023e96d0dfd42a57486a962ad SHA512 7003dab67bfb6884e9112ea4319deed0c2f05e3512139ac90d9e2dd71caa2f9f05b43e62dc1c3730c6d39ec347fe5b132e9fe5a7cf9708c3ff7a73aa70d70d8f
-EBUILD torrentinfo-1.8.6-r2.ebuild 654 BLAKE2B 0ec7e3f2d894f492608be8997886db39263fa798d7373ba94fff3756a749e769e0eddaa0ebaa0efc00141036c989b1f482802696e9b007743f60667cf20f7efb SHA512 6051b81e7c1830a775a43acd0c63d318a2db2aff9977649d50d74968e2a13d3ec349fc2a18661a98185e26980b3f795becc0352f5e55cd96a67a2a52a9d1b061
+EBUILD torrentinfo-1.8.6-r1.ebuild 644 BLAKE2B f4f6d73acc1aa066962516667b0da57d77f3c6c67b21f04731569e3ea0ac3859cd666f9211a28f5922cffcf07f8f8ece9230e0d1b61daa1a0558ad708a90235c SHA512 03388cec2e094d56ad552adfff6199818360274669ac83e824de1ae5d821dc3c1636a268184d7aa9931a0750a158a6016dfb8d14fd428d909a0baf299eee0ec2
+EBUILD torrentinfo-1.8.6-r2.ebuild 649 BLAKE2B 3c868a14d1201ca5076980ed7ee6965f95d049cc6eee4eec3627fbfc2ac1ef08630624ef5d083326522ab26936ed0e177a083ff245da05232a22088ae537cfe0 SHA512 68ef232287030d70247bd26f06eb5fe1e28327eef568c17f3a7c131bcbf87bb2eb22c0eeb35f4d774dc29755d94d3bd247b05b48484ab473917ef4ea4b8b4747
 MISC metadata.xml 514 BLAKE2B 5369e1bd1e98a7f74671ee33fb82473ec8154c75352d6d3c605d847ba605e22da4946e72ecd4799012f098ba6d82d46eadd599122c6820c1fa854bd6b58ae24a SHA512 8f37c7e38771055becfa77f5f2bde1dbf2bbd16c9b469f0b4174f9db97c8ace9836bed9708f8e375538140e4d3e194caeb5829dd8219c176a3745dbb55f38dd5
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
index c952405116ee..e98af8499989 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} pypy{,3} )
 
 inherit distutils-r1
 
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
index 71e0fd696395..0863b06ad861 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
 
 inherit distutils-r1