gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-misc
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
255 files changed, 2982 insertions, 2416 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8d094cfcfd1c..d5fa955f5b0c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index 40e4728c9031..e9c58a4f76a0 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1,4 +1,4 @@
 AUX aggregate-1.6-build-fixup.patch 193 BLAKE2B 99a4266726eb7ef36cb58c5f3ace8c36bc1f923f453acb003f3f59af179ab88e5ef641b387c03912f476a8bb29a46fada6ce5b4b6382d7328fd06752134ba186 SHA512 6c7508f88da5f287b5dbf7e12bf5891722300d11d0c167659c816a28dd38e2cf46de928b4cda48ee8ff6b6201b01cc6a41bc22345eb478ab255b5c1dc2713b11
 DIST aggregate-1.6.tar.gz 20566 BLAKE2B 8d7c9b16063da1481a1be57e1de8e73d5ee54ab8fe539b116263582b951bc84396b174388ce6ea1ee8126a1b1ac49e4e69dcfad8ded37f32edd429d620c4971f SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84
-EBUILD aggregate-1.6.ebuild 607 BLAKE2B f39cc7a9c10de657424362965169389b5e059808371d7f1dfd5239fb0d3ff436932eb81908d6c349aadf847ea0cbb70795ab0eecdbc96e174d46a2b7fa9cfa19 SHA512 31704e2ba7bfc05369e68d5a502ba9b2f59f666800dcb8f8fd7786a75f1bc43dc1a959e9e6e1d2c5eecb5d932dc8f5b00fec10b4cb5331770aa100fec7a3049a
+EBUILD aggregate-1.6.ebuild 629 BLAKE2B 5d22f923aff952c51800b9e6851ea9ff1ed54072030a8b77de3bee62f248a8101d7bc39637c4a82afe4230813d320dbc88711944770796d72f605c5c86621a1f SHA512 c43f44abea7dc476eda66592447dd42da5642fe4fa4c8f210bb0396f6df28c622702c652ca2fe482b82dac3dc874b8bfc3fb9483d30a179a1fda9d6d23411e20
 MISC metadata.xml 975 BLAKE2B 5478f76eb90bbdb4daee5ccc930312d6b1e6fa162e20824b1c6ee7c9371183ca3436fe000ba9b7c66d4b991ace6109b5ff4d0bd0453a7c055105e2d3007fc124 SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index 91a91c8a61c0..fd8c90d55f5e 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Perform two optimisations on a list of prefixes to reduce the length of the list"
 HOMEPAGE="https://ftp.isc.org/isc/aggregate"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="https://ftp.isc.org/isc/aggregate/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index b589fd9dff01..6d440b6d2c14 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,18 +1,14 @@
-AUX apt-cacher-ng-3.2-flags.patch 4172 BLAKE2B 9068ada51f5c12a662f521eee7a834c6eb07299a41671a6d8b47474bdbe15f1c25f531a9f2d058af97ee77d6ddb05fdfa64f018f3bb2ceaad51ac6b7a5f66903 SHA512 b57dc514d976b6f808c332c36c5014a407ec1e7184fb8653404dcf745872b03611ccc9f33bc42846429dc389b4b91831f308874deca4682e6dc636ea4c707713
 AUX apt-cacher-ng-3.3-flags.patch 2661 BLAKE2B 7a1d477819aae614b7598cec314de9627d9f56f974d4d5970be5b624b7cb6d6896f591a2d3eeea0e5af4f8cf264340cceb5a51961fae96343348180f0f66266e SHA512 e03aecb4332d34c1ed9dfe92e9c2fdd1a7f2e7a353039f9b86d14f7717fad2519c32f75a53614653323cf28f65705139244b5851fa6645f7461ecf3fce40394c
-AUX confd 90 BLAKE2B 5a0ba4fe7d07c4d74559f194cc497b0de5ea86db746fa8425267b9e1fe0d88afc3bae69129a60f4553729d24dfd09f910c037742181915d03f4c18b764f235cd SHA512 14412f717ad334e6ce5cf65b9b0968fc3ab27e93f3d3ce52d39e0b646694e8e7d7905ede25feeabad6ef3301b5644677f30e27b867ff32f665ab6c4e2cd0a662
+AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de
 AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
-AUX initd-r1 906 BLAKE2B 828ac672348454842e3daeb62e39436dce86f3ff9ba2319755f2bc64a20d3dc9e73689c27f79e7f521b6d6553c5d6922eb1b8d72a52a97c7f92b2847b6322b9d SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c
 AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.2-2.debian.tar.xz 48740 BLAKE2B ab2f6349aa66f39b778f346827767514761eeb8977d69a55940d7dd4c738b54ba20a9725387f769edf2cce454588746bc10361d4a174ed380a431a6ecf6b096d SHA512 e5299432b91cdf6cb51934fcc440e62d24c1b4849ad3a0c3a5e47a256c874ebb85c7ba56b97da27c2e03e0621b4ae42b69592440d521e718f4f8725a6ff379d4
-DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
-DIST apt-cacher-ng_3.3-1.debian.tar.xz 48472 BLAKE2B 9d7f531d84f470ada8236a5603d06e45d9b7acb7bdeb8bd639c250724013a0552819cabe67f1cee0a1f337d7725429932bdf179afae307242e4d45081854614e SHA512 44a241791b92d6b9231caff8296ed1d9536ffcdc18263451d662da01f1b257b8ea4741e5cfb09c5cd90986c46fe1e91b3110379442d9ed20434e696c6cf645aa
 DIST apt-cacher-ng_3.3-2.debian.tar.xz 48496 BLAKE2B 327d57cdf74798b99067cdd7153aaba4d3fb03c047203fb1d59fce730c68a28b6db2853f5f944843b96d8613f213c0399ba78aed1b3a186968f8767d03c0fd0c SHA512 aa446b8147a42fa44fcd29754dabe388eedc9829cd908314ba97e0cacbd17d6a0222789015827196ab6fe3efd51ab08a2673ae7c04f5c0781705310e28ca44e7
+DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b68fc891202c6406e91252eb4b1aee6ca87f3497e6f4a1ca9353d3a86f3a8a24059339f2c370a707427f5baecb1e8b6d3977b445a SHA512 b643d9b38891ffd6603239ddb8635dd3dcd7c31d7a32fa128e9b4d632fa08c95ca652e1bdbd2bb046895341bc4611c436e6ff4d997ae2050cdb84e56fb311078
+DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
-EBUILD apt-cacher-ng-3.2_p2-r2.ebuild 2715 BLAKE2B cf204efafbd483b174bd2f0627dd81c0d04bf9c232a4c7e694c43e0ad5dca58eb69180bb27e5f80f1981643d0696689c724a8417e56c4a1c7be032ac476760cf SHA512 bc9486e131b1d6fd294d50a62d9e20ac3e25d4fd24de9f28e334f6504140bd0a7217b1af0832ad70df5a08cbadced4229a51a7bb6df7e5a5b861bd6b3f24d98c
-EBUILD apt-cacher-ng-3.3_p1-r1.ebuild 2807 BLAKE2B 7d8fdc71ae134fe136b05ea1482640727960e134dff98cd200328c9e87ce378a88f6dda930da58123db17c157255c0f8e4e5282424beb3d41a42ba11f60e5bd0 SHA512 6c9428d87835712ee4676f24653adaec346a441e18de1f4bc4cc70e3b803546d84d5956994216fa474d2973a62c1e841b7ffd07ab9ba15d55d817e413355aa04
-EBUILD apt-cacher-ng-3.3_p1.ebuild 2713 BLAKE2B 51d2c1171543ff2aab95cbe97e5b3cb8d92e66ca7e8764227e71bce6dd8c1a0048e791d2fabe833bcd81104852b360f33ba06acc0dd1339476635e5445cc1026 SHA512 56ebef8ba58686261ebd7e4472e0c63f7494fe844c87d9eb531b4ad3e8ef02816cb5f31b34933649e1c542b2f60641d303550d75e84e5cd08d49af2e01f7ad0b
+EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2907 BLAKE2B 47adba5835b919179c63558378b1c06918a64af4255890c5c48a4c91713ebfe26807c5924df6048eb0b2268a1dbf7dd0528ba7473b4c43964618a163002c3559 SHA512 8a1cb4173e52229794d5e4b87cf9f11842d5529b87abf9ec34d56d9e3a83fb51f99b402e832dd0445d537d8dc66c4ee3da0c70c3f4751ef71aee6972f9808ee7
 EBUILD apt-cacher-ng-3.3_p2.ebuild 2863 BLAKE2B 20318be65af24050ec49f9b429e5119d0a0a2a7b426b66bbed13e861459e601e873d6abd6aceb540f11d75b316341a70d650160cf194b9dd60967fe7dff00c70 SHA512 bd2bd0728bc5049dc54eedcd38a09c5c33615cf09054e0e9bbd141dce845e0dae57d5d793c99406060871e7f375b962bd335fe9363f3e627095bc85acbd76682
+EBUILD apt-cacher-ng-9999999.ebuild 2791 BLAKE2B bdb7e182590dbe4cb0220216ea31ce4cd08238c47fa0e0f3cbb210e63c7ada4562c2b91a9aa45460b1b280465273849e8e517c3fab1129dfd2136c93257457a3 SHA512 01bd9b8a96655f882b53e602371a7cdb805056cee58b63b009c87308749bc7cbdfd1031c251f04746dafe4902d248a3234ecc0db81960b0044570d8dd45a8052
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
deleted file mode 100644
index 4e825f700ed0..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2_p2-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils toolchain-funcs user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-PATCHES=(
-	"${WORKDIR}"/debian/patches/debian-changes
-	"${FILESDIR}"/${PN}-3.2-flags.patch
-)
-S=${WORKDIR}/${P/_*}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	dosbin ${PN}
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd
-
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-
-		docinto html
-		dodoc doc/html/*
-
-		find conf -name '*.gz' -exec gzip -d {} \; || die
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
index 682a66fd9f07..6fcc74573fc8 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,6 +42,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-flags.patch
+	"${WORKDIR}"/debian/patches/debian-changes
 )
 S=${WORKDIR}/${P/_*}
 
@@ -112,6 +113,8 @@ src_install() {
 		dodoc conf/*
 	fi
 
+	newdoc "${WORKDIR}"/debian/changelog debian.changelog
+
 	# perl daily cron script
 	dosbin scripts/expire-caller.pl
 	exeinto /etc/cron.daily
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index a2ab7261f60d..8bde423cde01 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils toolchain-funcs user
+inherit cmake-utils git-r3 toolchain-funcs user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
 HOMEPAGE="
@@ -11,12 +11,10 @@ HOMEPAGE="
 "
 LICENSE="BSD-4 ZLIB public-domain"
 SLOT="0"
-SRC_URI="
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
-	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
-"
+EGIT_REPO_URI="https://salsa.debian.org/blade/apt-cacher-ng.git"
+EGIT_BRANCH="upstream/sid"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="doc fuse systemd tcpd"
 
 COMMON_DEPEND="
@@ -41,7 +39,7 @@ RDEPEND="
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-flags.patch
+	"${FILESDIR}"/${PN}-9999999-flags.patch
 )
 S=${WORKDIR}/${P/_*}
 
@@ -62,6 +60,7 @@ pkg_setup() {
 src_configure(){
 	mycmakeargs=(
 		"-DCMAKE_INSTALL_PREFIX=/usr"
+		"-DCMAKE_SKIP_BUILD_RPATH=on"
 	)
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
@@ -75,6 +74,8 @@ src_configure(){
 	fi
 
 	cmake-utils_src_configure
+
+	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
 }
 
 src_install() {
@@ -86,8 +87,8 @@ src_install() {
 	fi
 	popd || die
 
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${PN}
+	newinitd "${FILESDIR}"/initd-r2 ${PN}
+	newconfd "${FILESDIR}"/confd-r1 ${PN}
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/logrotate ${PN}
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
deleted file mode 100644
index bc78fcaea142..000000000000
--- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.2-flags.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-- Rip out additional CFLAGS/LDFLAGS
-- Drop osslcompat (bug #686608)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,16 +106,6 @@
-         _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden)
- endif()
- 
--foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold -Wl,--threads)
--	STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}")
--	set(CMAKE_REQUIRED_FLAGS "${linkarg}")
--	CHECK_CXX_COMPILER_FLAG("" "LD_${optname}")
--	if(LD_${optname})
--          _append(CMAKE_EXE_LINKER_FLAGS ${linkarg})
--	endif()
--	set(CMAKE_REQUIRED_FLAGS "")
--endforeach(linkarg)
--
- option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on)
- 
- IF(CMAKE_SYSTEM MATCHES "Darwin")
-@@ -134,14 +124,6 @@
- if(CMAKE_BUILD_TYPE MATCHES Debug)
-    set(USE_LTO_DEFAULT off)
-    _append(ACNG_COMPFLAGS -DDEBUG)
--else()
--   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
--   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
--   if(GC_SECTIONS)
--           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
--           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
--   endif()
--   set(CMAKE_REQUIRED_FLAGS "")
- endif()
- 
- # XXX: could use the modern macros instead but they were not available in CMake 2.x
-@@ -167,23 +149,6 @@
-    endif()
- endif()
- 
--option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
--
--if(USE_LTO)
--        SET(LDFLAGS_BACKUP "${CMAKE_EXE_LINKER_FLAGS}")
--        SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS} -flto")
--        _append(CMAKE_EXE_LINKER_FLAGS -flto)
--        CHECK_CXX_SOURCE_COMPILES("${CXX11_TESTSRC}" HAS_LTO)
--        if(HAS_LTO)
--                SET(ACNG_COMPFLAGS ${CMAKE_REQUIRED_FLAGS})
--        else()
--                SET(CMAKE_REQUIRED_FLAGS "${ACNG_COMPFLAGS}")
--                SET(CMAKE_EXE_LINKER_FLAGS "${LDFLAGS_BACKUP}")
--                message(WARNING "Link Time Optimization support broken, disabling it.")
--        endif()
--endif()
--message("-- LTO use: ${USE_LTO}")
--
- FIND_LIBRARY(HAVE_SOCKETLIB socket) # separate socket lib looks like Solaris-like environment
- if(HAVE_SOCKETLIB)
-    LIST(APPEND BaseNetworkLibs socket nsl)
-@@ -378,7 +343,6 @@
- 
- CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/include/acsyscap.h.in" "${CMAKE_BINARY_DIR}/acsyscap.h")
- 
--add_subdirectory(oldssl-workaround)
- add_subdirectory(client)
- add_subdirectory(fs)
- add_subdirectory(source)
---- a/fs/CMakeLists.txt
-+++ b/fs/CMakeLists.txt
-@@ -20,7 +20,7 @@
-                 list(APPEND fsSRCS ../source/aclogger.cc)
-         endif()
- 
--        ADD_EXECUTABLE(acngfs ${fsSRCS} $<TARGET_OBJECTS:osslcompat>)
-+        ADD_EXECUTABLE(acngfs ${fsSRCS})
-         SET_TARGET_PROPERTIES(acngfs PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${acngfs_cflags}")
-         INSTALL(TARGETS acngfs DESTINATION ${LIBDIR})
-         if(HAVE_DLOPEN)
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -4,12 +4,12 @@
- ADD_LIBRARY(acngstuff OBJECT ${SHAREDSRCS})
- SET_TARGET_PROPERTIES(acngstuff PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
- 
--ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc $<TARGET_OBJECTS:osslcompat>)
-+ADD_EXECUTABLE(apt-cacher-ng $<TARGET_OBJECTS:acngstuff> ${ACNG_SRCS} apt-cacher.cc)
- TARGET_LINK_LIBRARIES(apt-cacher-ng ${BaseNetworkLibs} ${ServerLibs} ${CompLibs} ${SSL_LIB_LIST} ${LDFLAGS_DAEMON} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNG})
- SET_TARGET_PROPERTIES(apt-cacher-ng PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_DAEMON} ${CFLAGS_PTHREAD}")
- INSTALL(TARGETS apt-cacher-ng DESTINATION ${SBINDIR})
- 
--ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff> $<TARGET_OBJECTS:osslcompat>)
-+ADD_EXECUTABLE(acngtool acngtool.cc $<TARGET_OBJECTS:acngstuff>)
- SET_TARGET_PROPERTIES(acngtool PROPERTIES COMPILE_FLAGS "${ACNG_COMPFLAGS} ${ACNG_CXXFLAGS} ${CFLAGS_PTHREAD}")
- TARGET_LINK_LIBRARIES(acngtool ${BaseNetworkLibs} ${CompLibs} ${SSL_LIB_LIST} ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS_ACNGTOOL})
- INSTALL(TARGETS acngtool DESTINATION ${LIBDIR})
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
new file mode 100644
index 000000000000..8fe769ada328
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-9999999-flags.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,15 +114,6 @@
+ 
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(USE_LTO_DEFAULT off)
+-else()
+-   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
+-   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
+-   if(GC_SECTIONS)
+-           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
+-           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
+-           _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections)
+-   endif()
+-   set(CMAKE_REQUIRED_FLAGS "")
+ endif()
+ 
+ option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
diff --git a/net-misc/apt-cacher-ng/files/confd b/net-misc/apt-cacher-ng/files/confd
deleted file mode 100644
index 72e76de133d1..000000000000
--- a/net-misc/apt-cacher-ng/files/confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# Additional options that are passed to the Daemon.
-DAEMON_OPTS=" -c /etc/apt-cacher-ng "
diff --git a/net-misc/apt-cacher-ng/files/initd-r1 b/net-misc/apt-cacher-ng/files/initd-r1
deleted file mode 100644
index 2e401dcd25a0..000000000000
--- a/net-misc/apt-cacher-ng/files/initd-r1
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/sbin/${RC_SVCNAME}"
-RUNDIR="/var/run/${RC_SVCNAME}"
-CACHEDIR="var/cache/${RC_SVCNAME}"
-PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid"
-SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket"
-DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting ${RC_SVCNAME}"
-	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}"
-	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}"
-	start-stop-daemon --start --exec ${DAEMON} \
-	    --user ${RC_SVCNAME} --group ${RC_SVCNAME} \
-	    --pidfile ${PIDFILE} \
-	    -- ${DAEMON_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${RC_SVCNAME}"
-	start-stop-daemon --stop --retry 15 --exec ${DAEMON} \
-	    --pidfile ${PIDFILE}
-	rm -f ${PIDFILE}
-	eend $?
-}
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index bbb68f6ed4a4..c1c5595d542a 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -3,6 +3,7 @@ AUX admit-noclass-520696.patch 400 BLAKE2B 034166c262cae8df913275c5838faed7403e6
 AUX cf-execd.rc6 319 BLAKE2B 0abc025c3b122627576a4f93b7963a5bfc4b9695153e02b855812cab529ada9acbddbbda63095f893eeccf3d5c1c6b861d5f7130db31d56ebbad3d70c9d33af4 SHA512 cac7ac5126d8d2f3c3acf61a694e89f6a2cddbf0748442e4ce82064a520c077adf2bf6cdcd8dda398b684699c03031e9b48178bd21c97badaa84a2776a04998d
 AUX cf-monitord.rc6 316 BLAKE2B b19ff5106f87b5fed13e090552c9aa00b67d8c6597525e055823638a9c7909da810efddea216177b42557ac15ea760c89e488960526a624c4c7a7b3c30f0dd78 SHA512 d141891e6cac6ddc4dad6c7caa623e5fb43846a91c23ae99fcc27e9fad5aeed6c5ee2ddc4bf88363523bd04c977241d649b818833e13a58319c4b8a48efadb1a
 AUX cf-serverd.rc6 311 BLAKE2B 82ee5abedac139a55ff886c8503d17f6ef35a3da9bb14975b5e9647652545869cfd30cadb3ed553c868040a23f4a42a6da6eb29aed8a4cece5bb19401108b835 SHA512 ef22d159ab71c311e5105709956cfca11dbe1569de4278a87bfbe82a496ac9b0e715b35f65b66a36dc84b7f4254d00172f16ab72240348282f9702b084a7b8bf
+AUX cfengine-2.2.10-lsbrelease.patch 697 BLAKE2B 346d5e21d49504ee1c27847d168cf07978a296c6a87a29303102ddc9b00740514f622ef79e942b679ea9358d4e715181dce349b4487fdd549d04c89e024c57c0 SHA512 dbbeeb73fb61dc194cd9800fe5be00a292bd106e5ba13292929b067f4748ccdd0f1127914382533323cb20e30dc43ead0963136e8e70c562b54998ed214d1864
 AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 460 BLAKE2B 81de82584ff683d13b2a209f9591bd7939e21d806269731cc3cdba73a0e07bcfa8495e108b419d8e80da3e99741df720e38f720b40133aa21bcc003c6bb4bc4b SHA512 14600a9b48c6ed326600ade59f833ab8d93837218070b5420ac7d4e45e1988a3e15554c8d9280c3d33d11613da3084ed728d5b27435d201eaa6a57978ad1167d
 AUX cfengine-3.4.5-acl.patch 1024 BLAKE2B 0cd02ca5c62cc088f9b18e55dae019cd2193d086d4ccba721869f2e2956c4fc613d3af07ad9831593dc06acc9a64788ab6a00ba32c0185a7b07351a578d50583 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b
 AUX cfengine-3.4.5-ifconfig.patch 1447 BLAKE2B 69fb92a9456705342f1231af7a21f3cf3c4f704cf17c85f99f3c4e85402d3364a03de3fb905912416e4c2ad257de017a76e197a7f07f8617eb530908ce843448 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55
@@ -19,6 +20,7 @@ DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
 EBUILD cfengine-2.2.10-r5.ebuild 3241 BLAKE2B 71e64eb4d323556416c67ddac89c3170d5178a38d4b072bca81172565d741e0d1c69f0b4de25df5713c8eaaae0f15b9724a579df87e0ca9718276eb117d10d22 SHA512 e4e02b753f443af0bd7966ee7ccddea2170ce080585e807eee514f4071d19da7fb1805b6fd6e42586b3c8ed2bc1777ff134b8853c6730a1b7c821b2f5ee792f6
+EBUILD cfengine-2.2.10-r6.ebuild 3289 BLAKE2B 64136477ff9d507d839024b28cc0e875928dbd15fb2deebbfd2afd75f62b58c95cf6276ad2a116db545fe84933caa5c9e3d8d2cf0ca506ec2e9aef6abeea60a6 SHA512 b7c635a2b631987fc2c773cdc650b46e64f478a7e8bd4e8249b8f6d356dc419e374e9f60702fe589cb2c775f0f8d65746805e16e3bd10da4245dca58198c8184
 EBUILD cfengine-3.3.9.ebuild 3491 BLAKE2B b74a4325583d6ae105e0fe336be431e12d99a5d6a63d9c242e0ef3318b646c0091403507f9cf767bfe719b7ee5c65d1037cd4f9271c2396f290a04e553f1318a SHA512 803ec254482363e66056005af2f2befb886d84247f89f0054b2d9fc8d288aa642764a4a6c686f65dfc954923ade60f3b837df7e1066d1e73992d19ae7b737154
 EBUILD cfengine-3.4.5.ebuild 3717 BLAKE2B e7385a42ab34a3016afb4b0ab01eb6884640d4cfddb77b0f2b23328f4897a42d5cb3654f603b58398bd8a2971c83428a16d68afee37d5cfd93cd9e42f61c8e6f SHA512 ac9b0b051fbb64d80041e9eced6199ab533a0437813e0e37de21c3aa64a6a482bc1722dad68f7b2818f8ed2739165e2e23148631778d17a043f01a966a1e6973
 EBUILD cfengine-3.5.3.ebuild 3791 BLAKE2B 5ea2c138d74ecad59d7a84f3c6deaef9691945087da761fe869e2444d7f5b02083acc32e6af2f9d9c25533fa19fa610f1d7ce0d142dfaa5082d0a55da45baf29 SHA512 3e8d3e5bedd37d0dc9838ef887db2085ff871810a1d98010d280e0fe2570e6aa96739f90bfa12593ba3d25716ef7b3f700cf13f1bc6b10264b98777264e9923a
diff --git a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
new file mode 100644
index 000000000000..87d5fa9341e0
--- /dev/null
+++ b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An automated suite of programs for configuring and maintaining
+Unix-like computers"
+HOMEPAGE="http://www.cfengine.org/"
+SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="vim-syntax"
+
+RDEPEND=">=sys-libs/db-4:=
+	<dev-libs/openssl-1.1:=
+	app-portage/portage-utils
+	net-libs/libnsl:="
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
+
+src_prepare() {
+	eapply_user
+
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
+	# https://bugs.gentoo.org/339808
+	eapply "${FILESDIR}/admit-noclass-520696.patch" \
+		"${FILESDIR}/511666-segfault.patch" \
+		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch" \
+		"${FILESDIR}/${PN}-2.2.10-lsbrelease.patch"
+
+	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
+	# messages say to turn it back down.
+	if use x86; then
+		sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
+	fi
+}
+
+src_configure() {
+	# Enforce /var/cfengine for historical compatibility
+	econf \
+		--disable-static \
+		--with-workdir=/var/cfengine \
+		--with-berkeleydb=/usr
+
+	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
+	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
+		-e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
+		-e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
+
+	# Fix man pages
+	sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
+
+	emake DESTDIR="${D}" install
+
+	# Remove static library and libtool file as they are not needed
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
+
+	dodoc AUTHORS ChangeLog README TODO INSTALL
+
+	# Manually install doc and inputs
+	doman doc/*.8
+	doinfo doc/*.info*
+	docinto examples
+	dodoc inputs/*.example
+
+	# Create cfengine working directory
+	dodir /var/cfengine
+	fperms 700 /var/cfengine
+	keepdir /var/cfengine/bin
+	keepdir /var/cfengine/inputs
+	keepdir /var/cfengine/modules
+}
+
+pkg_postinst() {
+	# Copy cfagent into the cfengine tree otherwise cfexecd won't
+	# find it. Most hosts cache their copy of the cfengine
+	# binaries here. This is the default search location for the
+	# binaries.
+
+	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
+
+	einfo
+	einfo "NOTE: The cfportage module has been deprecated in favor of the"
+	einfo "      upstream 'packages' action."
+	einfo
+	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
+	einfo
+	einfo "To run cfengine out of cron every half hour modify your crontab:"
+	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
+	einfo
+
+	elog "You MUST generate the keys for cfengine by running:"
+	elog "emerge --config ${CATEGORY}/${PN}"
+}
+
+pkg_config() {
+	if [[ -z ${ROOT} ]]; then
+		if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]]; then
+			einfo "Generating keys for localhost."
+			"${EPREFIX}"/usr/sbin/cfkey
+		fi
+	else
+		die "cfengine cfkey does not support any value of ROOT other than /."
+	fi
+}
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
new file mode 100644
index 000000000000..6f8dfa04d8f2
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-2.2.10-lsbrelease.patch
@@ -0,0 +1,24 @@
+Newer GCC mis-compiles the lsb_release reader function.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- cfengine-2.2.10/src/misc.c	2009-02-10 21:55:36.000000000 -0800
++++ cfengine-2.2.10/src/misc.c	2020-01-06 17:58:07.049226386 -0800
+@@ -1187,6 +1187,7 @@ if ((fp = cfpopen(VBUFF, "r")) == NULL)
+ 
+ if (ReadLine(VBUFF, CF_BUFSIZE, fp))
+    {
++   Debug4("(%s)",VBUFF);
+    char * buffer = VBUFF;
+    strsep(&buffer, ":");
+    
+@@ -1198,7 +1199,8 @@ if (ReadLine(VBUFF, CF_BUFSIZE, fp))
+    info = buffer;
+    while((*buffer != '\0') && !isspace(*buffer))
+       {
+-      *buffer = tolower(*buffer++);
++      *buffer = tolower(*buffer);
++      buffer++;
+       }
+    
+    *buffer = '\0';
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 375decf72049..5e0f43e57d4a 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -14,6 +14,6 @@ DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
 EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3
-EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 6277b565b82f3d9290322065d025ce6c706aa3d5a626f841b6e4b807cc1e23bfacd38f6d1e2f07f0fc0aa3993eca7d67e44029e1ef2db6ee4eee25e538e39cb2 SHA512 484a709b47094650d8328f1347a8c687fcd990f5a35e6b5da3da65edc03b1b57b21c3820dfda090ca709d5606c0ee3051c557364355ee73454ec7d7f1991be82
+EBUILD chrony-3.5-r2.ebuild 3034 BLAKE2B 376adea3af5e75ae1fcb690e43b953748cdccdcb72ef041f5d6fa26336f467b86b3b2e7676074d3da51b58642e99a65064eaef3c165b94aa99b3cb7a6d40a5f4 SHA512 fe5a155fb346526d51e78d6ece5480703672313ce7b75261f436b3065d44037b35a662e6571cc126c22ece8883958d86a20e93487299084a4cd418c15ba0b436
 EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c
 MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d
diff --git a/net-misc/chrony/chrony-3.5-r2.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild
index af17665ec607..508bbc8ff7ad 100644
--- a/net-misc/chrony/chrony-3.5-r2.ebuild
+++ b/net-misc/chrony/chrony-3.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="
 	+adns caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
 	seccomp selinux
diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest
index b24da7a146a5..efb9f5d2794e 100644
--- a/net-misc/clusterssh/Manifest
+++ b/net-misc/clusterssh/Manifest
@@ -2,5 +2,5 @@ DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee
 DIST App-ClusterSSH-4.03_06.tar.gz 81476 BLAKE2B 6b513cb86fd4827eb510dd26ded9aa2d45ac1fe484dc10b8cb841c8b1fb50c7f279cbc6a63e817acbbf66e4aea5faa4f32cc612c387d018bf09abb18919fd7d6 SHA512 87dff4c0445436c10929bcf30a9295deb6ddacca16939091fdab0cf67765c77706745ce8e738145ea6c67ec06093567b7668e4387a72b48018f8e173da5709b4
 EBUILD clusterssh-4.03.03.ebuild 1089 BLAKE2B ac9a5be053d65396bb35109f0120f85a2eead683f71122c4d68ae5fa3c5ea288fbfb27ac1961630a728d6e4b3895388d05ca31d272119d2a5b579d5b5ea4d2cc SHA512 aaebdc4ea6796fd7e83d60bcb4f5cdbe5c6875dd7069c1feb3cc588ef8027cba580d14a9b36a6d024e3c29a302565a1d82e0e5156e5c7ca4d61f086f7c44c86a
 EBUILD clusterssh-4.30.600.ebuild 987 BLAKE2B 1baf04eeabf7b2446f5b4b054ac8ef1d442c7b72bc8b9e6f8e26801834e069fdf78d46de3fd34f7e13d15bc0b9b5298180d80cf4f3e4c1d066b8cbe160b14703 SHA512 4e0640394d26a3fb3e8748d325293ef5cd22e1f231848f03da4349ea6b7d98a1f498bfaa67d195c6629d16b4cf9dd0122841a1efe06b94620cc2da3a358789e3
-EBUILD clusterssh-9999.ebuild 890 BLAKE2B 0b52b4dae26eab69611a98c8f43424f27a2d13d0d2c6cffff365d3e197405442055eefe86e0df69c57992879fb9678de63985d89f08a9d649bab68b39138a5af SHA512 d549b75771b4dfdc9e34300dce5ce21eea759948bcd3ed039f6038dcbf916b5cc65885c4d5521838eb7558da3e4e682ff867fb25d629238d35da383e3f10995e
+EBUILD clusterssh-9999.ebuild 871 BLAKE2B 6d559b7a1a350b462004fde3fe56a697efd60c06b8f786405b3c96f331a51e4ed1e5f171429060b02727d16b8aeed7d5406bb05df755bd866a8fa7ba86d6b973 SHA512 ed797c1eb3ef11aa8732d81508d58d393d4f8ae09c863f4661d49d14974b23ed67abab564772b92600211dd7e58de62c3bc6074885270afba900cbe60542868c
 MISC metadata.xml 708 BLAKE2B 7b8f81297e6627f6d072cb45a58319f12879277a5b2f414b6f3b7d0c0bdbb0358cd278b6d35e1bd4b01a4185a4f227706a43f21874c0bd36e6ba124eb9cb05b0 SHA512 f4033f8bfeb926bfb4a3ad935988068ed53eff91e35cb3683df27c8d56f095b7873a66fcd2e56c79df434a51fa1796c265d9d89334d3538b4f6a9f42755089f2
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 666c202462f3..19eec2cb92c4 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=5
 
-inherit git-2 perl-module
+inherit git-r3 perl-module
 
 EGIT_REPO_URI="git://git.code.sf.net/p/clusterssh/code"
-EGIT_PROJECT="${PN}"
 
 DESCRIPTION="Concurrent Multi-Server Terminal Access"
 HOMEPAGE="https://github.com/duncs/clusterssh"
@@ -41,6 +40,6 @@ DEPEND="
 SRC_TEST="do parallel"
 
 src_unpack() {
-	git-2_src_unpack
+	git-r3_src_unpack
 	perl-module_src_unpack
 }
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index d39c7f6c746f..327fcc8d24ff 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -2,4 +2,4 @@ DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952
 DIST cni-plugins-0.8.3.tar.gz 2001599 BLAKE2B e087814146c53d372af5b1cc47098f0060cb1528618d9848287592c0b442856114c711ea747efca4e8a79e9ee0b4285678a6e48e07d0698f1382c1e822a49451 SHA512 054479a73ddbfbdb2986ac202ae2da7a69ae7bb693a250885f950a26973c60be3053d4e95ca24cf5eb67c104b9af8231f859e22c01a066ce3a206a186fc55a6d
 EBUILD cni-plugins-0.8.2.ebuild 1180 BLAKE2B 65c6677411bba468a5c77361326aff928a83651e3b7326391724e83a3f7c5fb89b81819d2e12217e2fca64568ce53f1aa0714fe7cf05a8cbfb3a4378687d43c3 SHA512 2a390ea446112f068067d6e5d40e5a2d96242d772593856a1cb727c424ac0afa4e3e0dabf53fbecdea0613873f72d0d3018a72444ae58235a5e69905b800be4d
 EBUILD cni-plugins-0.8.3.ebuild 1181 BLAKE2B 9cf5c0c0ede72dbf6454166a2a1fab9c9adcdc40277d2542b526f6584148f9a4416fb710a4f352bd4916d9c4aeb29386527cf86cce7a57deaa35a22e68b4e11f SHA512 0c14d1b3a0df0a397d3c0253592ab4e6d76cdad8335db44a960b74fcf1424a6c21e4c4fa54d8460db9db3d5c7e41404c1c6872536d05699f1012c466b15af5b5
-MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
+MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/metadata.xml b/net-misc/cni-plugins/metadata.xml
index deec70d1fa6f..9fefca57e0e8 100644
--- a/net-misc/cni-plugins/metadata.xml
+++ b/net-misc/cni-plugins/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <name>Manuel Rüger</name>
-    <email>mrueg@gentoo.org</email>
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
   </maintainer>
   <upstream>
     <remote-id type="github">containernetworking/plugins</remote-id>
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index b118bd726e62..299db987c5b5 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,3 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003.ebuild 913 BLAKE2B 0eaaabddafbc141e22f2e44183e56753231b1a64e61a161b544a9be435d277af0c4aa43e5bc6efea1e3177b950a2cb537bd63207e0922cfb20154363fc854ed6 SHA512 c323ce6c093b1fd2ed4c00dda472596a83e44550594cc646985c7b85aac733ca18cbe379130c0fb8165c4d06a633876c47aaa5adef9b19a8a1e8834fbac02757
+EBUILD connman-notify-0_pre20191003.ebuild 905 BLAKE2B 1470c993bc2edaf3c20fc2bd57ca546d69119679455bd44bcdc288fd448afc6648b091239f92fa0aa6bf87585e13af10ed3218b596e72a6f9d4767033114af9b SHA512 d0c771eab2ade6db0bc41c554591591e51293978518e609c4be7f4c8f27bffef86ba07c53221c3444403e9b9442bf44de6963c63043644c764d1848eb32e65ba
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
index 4c4c3e6b29ed..3f875e44e212 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit desktop python-single-r1 vcs-snapshot
 
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
index ae63669f4bc9..0703692d98c9 100644
--- a/net-misc/crossbar/Manifest
+++ b/net-misc/crossbar/Manifest
@@ -8,9 +8,9 @@ DIST crossbar-17.6.1.post3.tar.gz 725054 BLAKE2B 1c60ae9a29f9d2831dd219c30751c65
 DIST crossbar-17.8.1.tar.gz 1545668 BLAKE2B 812a4b423bf663386255332de2ab90afb4f0a44d205a193d71523e7fa0aba2bf1644b2136200c6ae4b1639de2764b7139ee6081a5167b21abc2bdec6400c5a60 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32
 DIST crossbar-17.9.1.tar.gz 730753 BLAKE2B 8fb93b017b6af8264aa828a6353d1c6f5fd7f224797504f67f77b5cf2759ada5f9609eb6815da96afadfc2bae90acb2837be19ed0896e1a8ce37ff384fcea367 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563
 DIST crossbar-18.3.1.tar.gz 736736 BLAKE2B 546a7d4ff173928179eeff86aef50e3517067e6aede145a5185e891fe749e0e2c507b577ea3be8f416c5894e8c43db42d8ceaabbdc64823b305219c2f6277ff4 SHA512 cb85ba44054c59eecb751896c5f0d793ccc8990c9d00733de546512b7e500a90ef4042d49ec6f648ec3677687950fbee62208c9bbb6692de65df4f238a2414dc
-EBUILD crossbar-17.12.1.ebuild 6415 BLAKE2B 3991f26ce55b0dd6fcae0a5c092da0a211f9f1c429036fe3d28b5e260d3337c12f346f2e14d65a5024434d80e5f1c4431ca0f167ee439f231ab7d0bedc85af6d SHA512 729c4d47afade22115aba8866f65fe71c305df77f05a524a0e5727e01dd57ab53ffa1a250b16802efd71868d238822eacb71ef3378f255208391ad105d7e9760
+EBUILD crossbar-17.12.1.ebuild 6411 BLAKE2B cd8f50759df9ee32ef4ea6f87a87cc4e696756836e5ab41415d9661c6d48ef75737fdc839aa8048cf877656f112497b8abb29c7f40ee755cc75f86654b17a855 SHA512 d5da96f410dd9bba7f1e16f946c99f9589caa0af5da72c2a0894241ac81518fbc88bd8fc319b4c046b6e24db4235622d73939daf2e1db8ba80dafb301c494640
 EBUILD crossbar-17.6.1_p3-r1.ebuild 6057 BLAKE2B 8c21a15a98e477d0065d0d35817a552aaedb8e6013d6f17d2a759a4ace52db9b3755538e1f0b53bab3e6a2ac2278182031638050b7d97b0cfdd38e218408c415 SHA512 2b3592eca8bb2d29b0cf7e38d2052492fcea7f4f83daaaa07f2cb366cef1c8dada4cb7603bec5b5568ea9e916c7112cf7fd1bea8732ffe7ffc6f0ae8a1aa3c60
-EBUILD crossbar-17.8.1.ebuild 6462 BLAKE2B 2bdddfd815006f75c2d257f8b8f7b68e5ddb9aeeb10bc2d67cca00e37552c807ba69ba5689c6b90e402a406a47b3b2a8ebff3f941f002f946ca8873899bcae22 SHA512 6e057485a425817baa35ee6f04c4728fac89a13f327c4f01bf3f76c1bb1b0a0ba7ceaead740b0a5444e6f73475488c5cbbd864de9585809d79b9d051174db5d2
-EBUILD crossbar-17.9.1.ebuild 6412 BLAKE2B 26474f00a060b246c873d00d352f944ba927f3eae84dd3bcf23b3af32bfd9a059b886c7c8f7cb24a628c06c62e2f1e117ca38c2a170df6c3c74bd47d11c70151 SHA512 4635369aae527d60bb1a683ce46ff57ee39a5236f9b429a0ef5c1e301387b3faafe15fae4410d00b61b1c5bb7b4b491bc21de993eb811613b73024328e4c6aae
-EBUILD crossbar-18.3.1.ebuild 6364 BLAKE2B c4790ffe9591ea85835d19faa8758be159f7a592662061eec615d57d513f76ee2a5d787815c95fa17c0b003f436605b1feeb062701ba85d00ac021a83721f722 SHA512 2951664088d593adc6a9d5e66c4cbba4c0cab65947a4a2dac2fefa6521b53f9b40753d1e53bfbf7d7eb47bb4b03333f537f449b9373644b4e6fa3587d2d936bf
+EBUILD crossbar-17.8.1.ebuild 6458 BLAKE2B 90cd4aae6ed04c1a4002acc5116b77a3f20a66fcef516abaa42a73d2c19a5f3641b45bae4ac113feee644b4c9d51026c4a33d76a8dd4479168d544fef93adeb9 SHA512 ebbd8586f7897a098a6a70cb3466eab8a414ef0e7a7580c8f6ac6f7898156d5fd875af73a6d5cf762384cc5e691ca476fa969f5111e39143a0eacab2d44043f0
+EBUILD crossbar-17.9.1.ebuild 6408 BLAKE2B eaa6ddf22b89ea4fc054b8fa586e9d111990776a813324cb6583de1022cc01ac0a7cfbb1210582fc7fe70661024206333016a41daeb2b9d359e1340c7e49bccc SHA512 01ac1f4bbd526810fdb6f675ca9164c2d6fdc37e3cbfbc633cb37ca67a2d6866b9ac004e0119730c2e8181bd05581f25b58f685e6e14617dbffebdc5524c6868
+EBUILD crossbar-18.3.1.ebuild 6360 BLAKE2B 03b7639afaa35590f8fa62295b2b8a4bcd9f11729c193ed7638a20df425dc9c1d390a57ad93b77bcd185f5ddf97b9e66707e4593cf92a727f578a8b59d34d0bf SHA512 352acae32355f108b85147c521459db08f1fca16e56569dfdba9a1c89faa38186f4899ec7f8f994267ca2cd069817e46e902ebfb92fc58cf3d741d0c7ee3d7c6
 MISC metadata.xml 811 BLAKE2B 689aebe79e9e10ec110a4a5327245d727e3c6bb2e8e8dd3b0b07fefd8ab0032ec85a061309fc8fa8452e0c795c0a2fefed6ebd0091868c3815ab23d0e4a27c50 SHA512 f48554a367ca9b99176b6b3ed9b7322fd60ef4fe6ca78584263411a8e59fc9e89bccbca4c9484b1d267ed534ba6bab05750164f4802709795e1505e4ef276a41
diff --git a/net-misc/crossbar/crossbar-17.12.1.ebuild b/net-misc/crossbar/crossbar-17.12.1.ebuild
index e19adec356fe..713e12a96e9b 100644
--- a/net-misc/crossbar/crossbar-17.12.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild
index 4520fa8a4f1a..1dac2d540405 100644
--- a/net-misc/crossbar/crossbar-17.8.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild
index 5218923f9413..3ce1782e9f49 100644
--- a/net-misc/crossbar/crossbar-17.9.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
index f90a14aa47c8..9f47d7ef9b48 100644
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 7cb79323524b..b7963bb7e19d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,8 +5,10 @@ DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba15410116
 DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be70740119879beeb08ff2a6ace7737efe1fb6d96ecaacaf8f90dc0142ceede2b90c84275ea8f72bcd09f21dba SHA512 fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b
 DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
 DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164a77d7cb457924bd44c3069f1b03326861b73c51a6427d7169d40485a509f74edd89b99b760649e7adcdce693 SHA512 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29
+DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
 EBUILD curl-7.65.0.ebuild 6953 BLAKE2B 3f0dcce2560ef08897189f44afd843e0322176d6e1368a9bf02211670d4b5fed096d23b1eeb02f89eb44d12f10f1e78839f8dac2a5ad66b225bba5d967942a39 SHA512 b554bca7de8c0cc32e2075d35103da865929fc29c447d9fd0314a161b3b300f3e89d0df2ff8dca15e2d2aa6484ec97ca4ba078cb14abfca57a7b43e8d93d90f5
 EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494
 EBUILD curl-7.66.0.ebuild 7564 BLAKE2B 0b31777e043d3b5368103e244e02d316b396b8153b34738fa390f73a99af44fd2047733a8984461b7c856da984f38ac58f26c3bf15b49e0bcf466a61b5399e9f SHA512 889b8ff9ed76359d1642d4c0987a70a3b978118a3ca0c156eae6e7e5a21452102e8cb332dfcad0f681337f6cb1e3bf9f9fe46937a9bb13ea30d597a88430289d
 EBUILD curl-7.67.0-r1.ebuild 7591 BLAKE2B 49b533d4b4176b495b983e0e149934e3ae2ec694c2eeb8be7dd81c412ee7e4409243efca5ef01d395d8d46b78c9f6ad346b6d6bd35acb7e90393a2169b3b4106 SHA512 c633b9884c895558407cdaedd89bd1d71cd43bd9db97c7fc7952e2d6acad016115364a6da798b6ceb88d5e9880373041c25a53c943e35c01757d2cf9dc4bfb09
+EBUILD curl-7.68.0.ebuild 7613 BLAKE2B e3270e7970b9f046ab3cc598722aad13dc38cf6790f7872a9abdec78d888aaac62720bae5fc3ea62c98d481a1fcf1998956c28b2a5eed28713fe56ff43b1a060 SHA512 3d96b8aef75184f125df727cf3035af996b57fa089825636669200a0a50b0560750e6e248a42806b50a2e5b8d8bfa81edf9da989a15c978c86b502598b187aa9
 MISC metadata.xml 1219 BLAKE2B 981090b46e9e66661074be920692e688ebd351ad1770b3a1b76ac6f3b6cc66c70c370031affdf5f72b2141e04ab7e4e073b4bc1fcd0295624e14a929cc3714d1 SHA512 9f86ffa85c0ac69c7289a97a92d5e592a17e5cc23b62be980540cdc8702cf6151361be4f171446fca317d2dcb1c5879ba8ae1ad0b0d99ffb54366ca35df4052d
diff --git a/net-misc/curl/curl-7.68.0.ebuild b/net-misc/curl/curl-7.68.0.ebuild
new file mode 100644
index 000000000000..31286cc893a0
--- /dev/null
+++ b/net-misc/curl/curl-7.68.0.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable alt-svc) \
+		--enable-crypto-auth \
+		--enable-dict \
+		--disable-esni \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-bearssl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 33fcce71feb3..2b1fcfa1e50b 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -1,6 +1,7 @@
 AUX dahdi-autoconf.conf2 1067 BLAKE2B f6c64135e4b47ce3eafd4b79b4e02ea8bc4d46ab36e30203cf061a5541fc2bdc9bdb2bf6050bc36c8d1e1b5f2ba07f72e83037eccd86ead45fdc97e8a4a3d767 SHA512 7de2ad496a48da487b0f54b0d3c98681e72ebb86107bdf091c74f410d0e2598fe21e1b876eea81d72ef5250570a67a2ece19de6d003b9bbc3def5fae9173189a
 AUX dahdi-autoconf.init2 5817 BLAKE2B c8186a6ff1188ed1d91b86db2b6e861297b5927c7a2cc95a95eb656d4149f2d01c2d8b91412e440f76e9fcb3ff530aef00dae04c38763bd84575cadecdfe2692 SHA512 0201e4555a8c3ccaceb4cfe1fe004dada847608ad6d8ad031f788f72b056e0d0ef0bdad653eb2f492ae08444c2094dc00ac73180a4107eaabc5f5258a91fa50d
 AUX dahdi-nondigium-blacklist.patch 507 BLAKE2B 5cd8264cfb6792db5fdb92b32dad33a224defb876807d260fbef9f72b943f56f8415a7f082752e261c03982c6b016fe1ce8034d98c6a1aac4cfee7c9d50b3ddb SHA512 4fdb4933e05e07812d1a94efb9bda9038aaadb8a1830cb9ba99d62346f2d007e827771f8de144ef09d6ee5adb1a571ca5ef8ae646c7f62bde8232af30468c2ac
+AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-2.10.0.tar.gz 655475 BLAKE2B da24593def6f1f08bc9a2cc98fcb06dafaf419410bac2f93b00d2085fb7ed2ad3b72ba7731ec368b54aad318057a2a1998bca5e56907729c9261c3c4bd0705fa SHA512 cf84d1117ac6b4dbd87db4a6ec072e945e64677fbd5dca169e06d954c599ce4ff9a80254aa3027bcc02f7770a5e0a3bcaca075aacfd28c62870d011801d0d225
 DIST dahdi-tools-2.10.1.tar.gz 656275 BLAKE2B ee6d4679b22eefbd1bb0f6fb9375f5f0a42ba95418828c2e318469edf06bd9b6b59e826c821a10cda8a93861219fc8d15413280b05a2aa722e65e0c18e2abd70 SHA512 856116119336b1d51da1c263c95e361c379d61b672db69703f48fb260d570f9335169b8c53daf7d6b18725eb3112539fd9e229b257ff6e9d76a00e74a859da66
@@ -9,6 +10,7 @@ DIST dahdi-tools-2.11.1.tar.gz 1500037 BLAKE2B 84583633cf1e125e7e4203c9f3443765f
 DIST dahdi-tools-2.6.2.tar.gz 843572 BLAKE2B 5bdf3d8ad5a853b29bc93dbb33ab4015beee2f362aa8e2fcafabb4ae5cd4511479a392e8505d1da6448590538c5e3f9b213d3c6a8774446e314ee26077f56065 SHA512 3e0abb7cdfff072720bf48ccdb5cc43d183e0c3217b1eadfee7920f5b29cfe31f3b79d981516ae95232065c7686a87f169835802788cb1185c3c947feff275c3
 DIST dahdi-tools-2.8.0.tar.gz 642755 BLAKE2B e235fdb17084df4fff6c4e18f0555cc5e6926d7adf7a443a018c6a267d6a4f2480d57c133be6ab682f64e7a798513ad5d35ac167574d666b44965208f4af4a85 SHA512 983e1dfe9bda130c3d0e60f44a79ebb75ae8ab9f27bd77d0355c58e901012465a37411fb1cdc97a131ac01ac892f37729f5853439aaba4ba5a4927c7a7997f81
 DIST dahdi-tools-2.9.0.1.tar.gz 649990 BLAKE2B 46e8f77d57e1b0b5083994dc1eaba28009c69c9a8442e9c2f981c20d251f4126ea34713df0be12b2e57055637e0780b9a8166be9e4df574c462bf7dbd9c688a0 SHA512 2e16312d4f44aa50cbd7d843514aca06b8f1019b114a00ca5a76cf40ea9b8e937766e70c7628a76a991fa3ad8a12d36782c378a2ad783f9882f0225429794494
+DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
 DIST gentoo-dahdi-tools-patchset-0.3.tar.bz2 2250 BLAKE2B 2ca4a699601fa1bcbbba4574596302164a022550d782acb8b6df85e1296dfb54eb44c6abe6b3ac3044684def4496a733a4bf542e99f0e11550537ba5fc75c9fe SHA512 15bba73140ede20f49f69419d9ef9a4f242d18ad2da6edee6e91c44fad7ddaf5aa7d6d9e5127c0af0f384d81b4bc8c3fae9e5504d13279abb7ac3db2d01b6a43
 DIST gentoo-dahdi-tools-patchset-0.4.tar.bz2 2665 BLAKE2B 79698214b5f61112e678dd0ba24c4043a6506ced293576cbb8a26feede8cbb3b498caf6f450e96571bf3debcc9caf2712482d3c77b90e43c7bf8ea782ef99ef4 SHA512 e48797bd5e741ba94bfd2b19c088ae51812272dc67e7fac04a0c52df9a8371443112d0385e31fe0b812acfc4c912c8cc38e9c632131d5ede55afc43301e2c2be
 EBUILD dahdi-tools-2.10.0.ebuild 1143 BLAKE2B c92636b1cad936fb9b9f97a8d21928186efa4e951c2f8e99c61e5514034e3da2b9b2c44f5094f159bddedced779bfe476c9d4032c1f4d8b1f205f31d63246cb5 SHA512 a676b96671665a7e02bf92e89c301da1c870a19bfc2659dbeeeb756603d7919e497740e895dd12b308f477c8c5cec1f834ab937160c9d37849777bfbc665b8ba
@@ -18,4 +20,5 @@ EBUILD dahdi-tools-2.11.1.ebuild 1514 BLAKE2B db13d058b35176e206d3c01045af6487b5
 EBUILD dahdi-tools-2.6.2.ebuild 1142 BLAKE2B e56f23fd0ad6e2a3d5739492826f257987788bdaeef5e5123ddf2ff05a15656fb39200089c0b6c292d03b0dfd03150501e1c76fce6c1bdc37061c9fb87d8e7fc SHA512 0a40014c9fc78a7242c871d4aeaa01e401ef5d1d97b16597c655cdcf97bc0315932b633cf13e6f3ccddfcea4f60d0e0a71d294e57e6be84eeeedacb61ee06307
 EBUILD dahdi-tools-2.8.0.ebuild 1142 BLAKE2B 4bf03468a83e536ad1e378412ce9dde3292db6dd4910ef84ce0a80e14c95c83f8e0b3f87c7e2b52d722ad3a868e71c5dad6d1e2f09d62587381f8cfb4d14dae5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb
 EBUILD dahdi-tools-2.9.0.1.ebuild 1142 BLAKE2B 4bf03468a83e536ad1e378412ce9dde3292db6dd4910ef84ce0a80e14c95c83f8e0b3f87c7e2b52d722ad3a868e71c5dad6d1e2f09d62587381f8cfb4d14dae5 SHA512 2ce2e7f671fe45402bea42733b98c663de58f8197a2fdbf5b089aa57a8958115ed297ee89ca265566bd3e5af10763a1a38069322f9f3e0705cadd121f4e19feb
-MISC metadata.xml 325 BLAKE2B 54a905375bfd8c4aa60b6921f97d4d179c1f3062cbd78d586b6fb16f6e0c42211a555dfa10a9089372d1f043c3e296ee4b58906756f944b255d3af3d38cc4159 SHA512 ee8b15b61b0a2bcd1b11fdd55a4c034d1a0f10eaa02b78d6df11af4c5e8f0976fe8bb8f9583caf38a9594ec75e69c76506ba9655baad66a646fb74809dbc2e42
+EBUILD dahdi-tools-3.1.0.ebuild 1458 BLAKE2B 17f482662ebf19be6f1463fdd7055c4f13287c93b0fc68a5071a05f5cb9841b86b59cabd1a8aadd450a7c866fb1e80b0140ba149da508d14843a6c1d613659d5 SHA512 39f513ce0e83c231f364ec08d2d75ed532fc52916e6a6ab0eff427182c1fefd83167cf773572446a004f678634b13c427ce540d3a65d223992555adede0e838f
+MISC metadata.xml 443 BLAKE2B 5a35a0f5e7aa8d8b19423f8aab317e7eef695b76f1b541a96af1c0f6194d3919a56260e3a461a0acbabd268f884265876b9601348179a976b620f39ca4bcab48 SHA512 d071770c4efce5c06137822cbf002d29c11b59f004afc537008417204851e05751df7b21140abc74e8439baa00d2e15bd596b4436f8e8aa5815ea8200018d007
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
new file mode 100644
index 000000000000..2a8c5a467685
--- /dev/null
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 perl-functions
+
+DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ppp"
+PATCHES=(
+	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
+	"${FILESDIR}/dahdi-tools-3.1.0-parallel-make-no-config.patch"
+)
+
+DEPEND="dev-libs/newt
+	net-misc/dahdi
+	sys-kernel/linux-headers
+	virtual/libusb:0
+	ppp? ( net-dialup/ppp )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ppp) --with-perllib="$(perl_get_vendorlib)"
+}
+
+src_install() {
+	local bashcompdir="$(get_bashcompdir)"
+	local bashcmd bashcmdtarget
+
+	emake DESTDIR="${ED}" bashcompdir="${bashcompdir}" udevrulesdir=/lib/udev/rules.d install
+	emake DESTDIR="${ED}" install-config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
+
+	# install init scripts
+	newinitd "${FILESDIR}"/dahdi.init2 dahdi
+	newinitd "${FILESDIR}"/dahdi-autoconf.init2 dahdi-autoconf
+	newconfd "${FILESDIR}"/dahdi-autoconf.conf2 dahdi-autoconf
+
+	bashcomp_alias dahdi $(sed -nre 's/^complete -F .* //p' "${ED}${bashcompdir}/dahdi" ||
+		die "Error parsing dahdi bash completion file for commands")
+}
diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch
new file mode 100644
index 000000000000..9575966435e7
--- /dev/null
+++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-parallel-make-no-config.patch
@@ -0,0 +1,19 @@
+--- dahdi-tools-3.1.0/Makefile.am.o	2020-01-09 12:23:37.943059915 +0200
++++ dahdi-tools-3.1.0/Makefile.am	2020-01-09 12:23:58.863036654 +0200
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS	= -I m4
+ 
+ LEGACY_MAKE	= \
+-	 $(MAKE) -f $(srcdir)/Makefile.legacy \
++	 +$(MAKE) -f $(srcdir)/Makefile.legacy \
+ 		top_srcdir=$(top_srcdir) \
+ 		srcdir=$(srcdir)
+ 
+@@ -131,7 +131,6 @@
+ 	install -m644 init.conf.sample $(DESTDIR)$(dahdiconfdir)/init.conf
+ 	install -m644 blacklist.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi-blacklist.conf
+ 	install -m644 modprobe.conf.sample $(DESTDIR)$(sysconfdir)/modprobe.d/dahdi.conf
+-	$(LEGACY_MAKE) config
+ 
+ dahdiconfdir	= @sysconfdir@/dahdi
+ dahdiconf_DATA	= \
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
index 42f88a34db7c..ae2616ecadf6 100644
--- a/net-misc/dahdi-tools/metadata.xml
+++ b/net-misc/dahdi-tools/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
+    <email>jaco@uls.co.za</email>
+    <name>Jaco Kroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <use>
     <flag name="ppp">Enables PPP/DAHDIRAS support</flag>
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 53e335a69a41..9b44b43c46fd 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -23,10 +23,12 @@ DIST dahdi-linux-2.10.0.1.tar.gz 2042867 BLAKE2B 221f9141e9d05c9322ff75857c32c64
 DIST dahdi-linux-2.10.1.tar.gz 2044847 BLAKE2B 242a3f440e0af7a006f2d96f2d9dd7d2e7095f795793301fc2d60e9c6e10124ad9c79e84c0917700dba74ee9cd4b2e49f81e23d7645532ca5af1b257f952c43d SHA512 3ef877ba104e720f3292fc95450968ec1d46cc54f807492a2d41fe768e9dde554a420928f45b7244647b5bf2300863e150ee23c9920fbfb7afa6cb46a77a2087
 DIST dahdi-linux-2.10.2.tar.gz 2044873 BLAKE2B 8c6bab0fb4b8436bb3b6f1f002e41fbd4269f5f64bbfe14519ae271c4cdd767a6898df771415960f5ead052f10a3aaff9ea1b67cc64b74da78020b8806ca9e1d SHA512 b585a408ffb7b95a5e1a47dff14be93e2ce7420e5b3b3160ccfc0ca8df153ec1f36c56c96bc4f7b20bebda0559ec03481e1307feb8e10eace68737e8f8783537
 DIST dahdi-linux-2.11.1.tar.gz 2045435 BLAKE2B b84b8717a7568b00ab9cb9f6edb5a04f2c085655ee07c9637fbd09faf3e520beaa0f5a13e6864ba06e92bd1bb54b28e08c36f2b5d16dc9510ecae9ea61f745e3 SHA512 db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224
+DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-1.1.9.tar.bz2 102384 BLAKE2B cf4abaae393d754c1388544710ab69bd727d54963c7df6c7fcd56a450d5ea0242ae1bbbe45855fbe5bd3b3150d28676490713f9dd1331e42c0c2fa5243415b69 SHA512 63378c916af787549d3d092ed9532ebdb6106675d96cb124eaeff8e70bdf28751f30745a6e6f78176bf8411031fcfac6bec4f38e18e48ca0b363ef815bae4770
 DIST gentoo-dahdi-patchset-1.2.0.tar.bz2 103096 BLAKE2B 8c832d97a50985aa763ff38699c0c77d2898dd3e2d0c35c47a1459029606fc5b5e2d077c4c5968cb47a007edfa0a18ed634a2f24891225cf8195e44c66640b3e SHA512 b700a31bb670146d5e8a5745deb8a62a6d3b0a65e1532d1ac8c5effa32c4f5ce0986f441eec5c41d94554e04723e71f0063a1f2700e6d2280b7bc7ba1f7f7b04
 DIST gentoo-dahdi-patchset-1.2.3.tar.bz2 103028 BLAKE2B ced190c538a358614ceeafc55bbfa9e3d619b82a461fb59631e46320b3fe7d018e9ce4483c0d61cc39625beb856578c6f3af2fb6a8a6ddc421034da6e7c56213 SHA512 f98170a3a98445f84586805b330ce6ed7e3a89d36162e9aef6c7cfb2c1bffbac5bde82764352b519b0684b4b19a7157696d633fccd66d0949e0cc74ab17a0517
 DIST gentoo-dahdi-patchset-1.2.4.tar.bz2 110136 BLAKE2B 2a07b3e5d71e30db339fee5d0e0489dad69c0c0a536daaafe24080f3d548153f980fe549126963aa4d9fbe2c9b17b54db840c452dcb0ce0f7f3a95392e362d80 SHA512 e16d6277764b6e8c9a79712f1e0c7e2d30877ce467b55fc4bf19d89025d6155eac6accf748ffd680c6dd111ebe45a40c311cebaf85f4feeb047a37889c948210
+DIST gentoo-dahdi-patchset-3.1.0.tar.bz2 2224 BLAKE2B f07b8a1ecf7996d9e970248216b3ceacd991ecfe4e6e9cbf408c47e7e29e827a5ebedd399d611bc7c286309095c109d30d6c7f03ed4c95c8e89ba816ed59e002 SHA512 ed88dcf023238a8cea33fc32957ec28a237eafd0315fd5b73bfcabb95ef5aa304a94ce38a6233f37810162cfc9467876128003e818145a6942e7133a68243d42
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
 EBUILD dahdi-2.10.0.1-r1.ebuild 3619 BLAKE2B 78303522ad9ad22932719028da33f72baadeca7e380c535d10ed95c42941a19502175de1630dbf7dcd484d2189cef4d94813f69341f44527415f5d3da28843b0 SHA512 94273131542d58fcaec97471fd65a9503f1fffd833ef7632503a776c10805cda1f7da6163d2d5683adfbb47085fa920b8a527e37ee867df0ffac320d252fe8f9
 EBUILD dahdi-2.10.0.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0a89347c305f631b9208686f83e5fdb03612e4ab6814dc1f90f90c74701dd5312c1b9ad17da1dbf9cf5c53368 SHA512 a9acaac3ac0d81b07f96c7d30ea2bf41e950dde07b53d2e800e792720ce82317f481322bdb472b10fc78aad7a28f5dc91b1d170025c185b4a0301e0a11f28d07
@@ -34,4 +36,5 @@ EBUILD dahdi-2.10.1.ebuild 3617 BLAKE2B d4ca2fe5dea6d1c175224a3bd72d6f15073d17c0
 EBUILD dahdi-2.10.2-r2.ebuild 3618 BLAKE2B 5105bc86b9eabe1deddde2196d6bf98646a00a49f47d59dc9aef61d25bdf858d496da6663ad72262a79e02a408ed9eb8c44876a8e13c48f66d67caae9fb7bbe3 SHA512 73784dc279ce84937e52cdf2df7df9da91af842944bf2dffbabf780da04d5477067f791aee701b4b3615a14a667520fee602f601021304d06b1154e401e0ba4f
 EBUILD dahdi-2.11.1-r1.ebuild 3668 BLAKE2B ca3be7eda7090e86fa17d221bd1b3764a40b180735a4b00acae5df0654b2a3857802054fd167ea35877c61f82521d6cf9f8c420df68375572f24c2bc9ddcd281 SHA512 62c84fad523c3c58e3d81e1a4bc5b956a7fcde28ee088060f579913e1fad4b6a02895a8c3a0cb2795ba52a156c1b252214bbda1c248a5802613a3cccef755ffd
 EBUILD dahdi-2.11.1.ebuild 3682 BLAKE2B 3ff22d2b78db250bcb1ba265500861e1bdbe920d9871567f26ae736f87e9859fbe6399c7a9466c33050a98f738aa46dd534d7c80bac92a528aacb41126a7ec58 SHA512 6434e30a359f02afcade7384dfe2511ae3ca829abb7553be74bfd6cbe9be27e98be73eec7cdf5af70a082110dcae9585cf4d94b58f924b00d6e33dbe37c9df4e
-MISC metadata.xml 327 BLAKE2B dc7842c2aec03bacdbb85d43b0f13075d77fd36fcd1398b46ac2fcfa0862d2a1d2c2ce1cb6c4dabdd019b7a202661cdaf822223d510d0972e840186a2dc30995 SHA512 ee6a6009392a739eb25095468f78d7c76a09d49141faf8444e2c6e9969f05e4b1748a4f518127c8b14298746515c0606a6949d4629d75b5343ba56f72dc2eb9a
+EBUILD dahdi-3.1.0.ebuild 4390 BLAKE2B 43d5c4b96e27fc01475ff5aa7ac852bbdd5c81688ccf8e183dbb91fb9287c49e824119f6d445859203d1da6b8f929d7adc04e0584888898c62c507805708f943 SHA512 12e015927e398f928df7ac74c54584c879ba7710dca044bbebacb356911d63ce2604b485b7d6e5d94370d500ddec67908196cec3c0470a0ad5493eae18d9a395
+MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
diff --git a/net-misc/dahdi/dahdi-3.1.0.ebuild b/net-misc/dahdi/dahdi-3.1.0.ebuild
new file mode 100644
index 000000000000..acefda64fced
--- /dev/null
+++ b/net-misc/dahdi/dahdi-3.1.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-mod toolchain-funcs
+
+MY_P="${P/dahdi/dahdi-linux}"
+JNET=1.0.14
+GENTOO=3.1.0
+S="${WORKDIR}/${MY_P}"
+
+JNET_DRIVERS="cwain qozap ztgsm"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)"
+HOMEPAGE="https://www.asterisk.org"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+	https://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz
+	https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-${GENTOO}.tar.bz2
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz
+	https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="flash oslec"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${WORKDIR}/dahdi-patchset" )
+
+CONFIG_CHECK="MODULES ~CRC_CCITT"
+
+pkg_pretend() {
+	use oslec && CONFIG_CHECK+=" ECHO"
+	check_extra_config
+}
+
+src_unpack() {
+	unpack ${A}
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		[[ "${file}" = dahdi-fw* ]] || continue
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/ ||
+			die "Error copying ${file} to ${S}/${MY_P}/drivers/dahdi/firmware/"
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	mv *.bin "${MY_P}"/drivers/dahdi/firmware/ ||
+		die "Error moving firmware files into the right folders."
+
+	for drv in ${JNET_DRIVERS}; do
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.c" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.c from jnet to DAHDI."
+		ln "${WORKDIR}/jnet-dahdi-drivers-${JNET}/${drv}/${drv}.h" "${MY_P}/drivers/dahdi/" ||
+			die "Error linking ${drv}.h from jnet to DAHDI."
+	done
+}
+
+src_prepare() {
+	if use flash; then
+		sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h ||
+			die "Failed to define FXSFLASH"
+		sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" \
+			include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME"
+	fi
+	if use oslec; then
+		sed -i -e 's:^#include .*oslec[.]h:#include "/usr/src/linux/drivers/misc/echo/oslec.h:' \
+			drivers/dahdi/dahdi_echocan_oslec.c || die "Failed to prepare oslec source files."
+	fi
+	default
+}
+
+src_compile() {
+	unset ARCH
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" all
+}
+
+src_install() {
+	einfo "Installing kernel module"
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" KSRC="${KV_OUT_DIR}" DESTDIR="${D}" \
+		DAHDI_MODULES_EXTRA="${JNET_DRIVERS// /.o }.o$(usex oslec " dahdi_echocan_oslec.o" "")" \
+		LDFLAGS="$(raw-ldflags)" install
+
+	rm -r "${ED}"/lib/modules/*/modules.* || die "Error removing bogus modules"
+}
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index f804fe3a2199..b132a89f1bb6 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/metadata.xml
@@ -2,10 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
+    <email>jaco@uls.co.za</email>
+    <name>Jaco Kroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
   </maintainer>
   <use>
     <flag name="flash">Support (short) flash on FXS</flag>
+    <flag name="oslec">Enable OSLEC (software) echo canceller (require ECHO in kernel)</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 5d08af511c1c..c7923d6172c1 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,3 +1,6 @@
+AUX dhcpcd-ui-0.7.7-tinfo.patch 588 BLAKE2B 1f6ac41accd2643450721364e5fd907dfeb16981935643218804f94599b0d5c973202669a8eb5f8304f63037ff4be3f146f0f794564179c01574e02d0544d138 SHA512 be55e055ff66ca25bb24c2375a7cde3091a0bf90a4490e9f012a9563bdbfaff28f4e92ea0014c640d57fc296515dfd3d3757fac5fbe8b9f1985d97c23f3c9ce0
 DIST dhcpcd-ui-0.7.5.tar.bz2 209112 BLAKE2B 1eec904acefbc5059496419991b1d53c6715d56e611e09d7474879b4ae2741e61ce85bdd7ca32db42a8a890790d8784ee8904fa1228ab43488a88480f73dcd1c SHA512 78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2
+DIST dhcpcd-ui-0.7.7.tar.xz 195648 BLAKE2B f382e331326e66d81674579ba018e6f9a6662df9d10fa0cca92808290e5d7621e7861afaa3d9a2c4d05fcc24b619922f8740faeaf4a531701f5d14505636fdf7 SHA512 46f66c16986c248740b2dc8ce0edb663fbd35809d2d21f701588c3736cdafb32b04c57ffbc6f8974841499ab46f6a1084d0a761b290e9d02ea3a9fae36a0ff3d
 EBUILD dhcpcd-ui-0.7.5-r1.ebuild 1168 BLAKE2B 4d8ddcf2828a6b7523861e74b29be68d1cbef7fbaeea01de7920ddf6d64206179f292626238639b74bfb34b83307b1989810aa6f35c7c978cb0798e8b919c30d SHA512 9a89b625ccd2b930266a5767f38a6e3f42389ddd2a3b9312564a3782948598d251ed957c33a0be852e754445c6574dc566c1ccd47eb5ae734d0053b618124526
-MISC metadata.xml 271 BLAKE2B d35f3e181d7989e6fa9e9cd6923a47aaf9723824442648ce9cea821c560a290fd110b67d5440d095aa67d576cc984574993959fb0fc6069600e4935f13166b3d SHA512 f105166a6d7a278c725e881cd33a253058e0cc4d57d4bb616c09c90e557cc31824b94b41eef95d1241cb31aa0058f34fd95672051c93331244869b7d22433598
+EBUILD dhcpcd-ui-0.7.7.ebuild 1311 BLAKE2B 9ee8198fcb9b50cd813e0afed8f4efff1d3af91d02b8be6b998f11ffba75a6b6f9ed7036eaf84dc29f52e55b4a1cd37608ef1b39173f0a5092b91ea4bd9dd1f0 SHA512 dc7c0a5b1ee4ad0285a5561bce58cb6ba5723883e55947a61d0c9a86b195cad85378a952f82351e9c2906018a9f93b0c4bbee5b7ebff4154c3fb8507f4c412b1
+MISC metadata.xml 379 BLAKE2B f9018bb0bad0ae5539e4d49b96cc61303ebeed6506464b15180a50e186315cb5c4989e2092237abbec4002932b4468c80c621f0f053a8a01b502db873e7a198b SHA512 8ce600176afa1fb8ef3d6f17f22b2757bd719f6a12cb377ff909333a3cc4f3d9b0e563c9cd3f11ddcf4151e5362c4fa66825eec9e8ca0ca3180f170b9334d2bd
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild
new file mode 100644
index 000000000000..710c97f90b5e
--- /dev/null
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Desktop notification and configuration for dhcpcd"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd-ui/"
+SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gtk gtk2 libnotify ncurses qt5"
+
+REQUIRED_USE="libnotify? ( gtk )
+	qt5? ( !libnotify )"
+
+BDEPEND="
+	virtual/libintl
+"
+DEPEND="
+	gtk? (
+		gtk2? (
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf:2
+			x11-libs/gtk+:2
+		)
+		!gtk2? (
+			dev-libs/glib:2
+			x11-libs/gdk-pixbuf:2
+			x11-libs/gtk+:3
+		)
+	)
+	libnotify? ( x11-libs/libnotify )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		media-libs/mesa
+	)
+"
+
+RDEPEND="${DEPEND}
+	>=net-misc/dhcpcd-6.4.4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.7-tinfo.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--without-qt
+		$(use_enable debug)
+		$(use_enable libnotify notification)
+		$(use_with gtk gtk $(usex gtk2 'gtk+-2.0' 'gtk+-3.0'))
+		$(use_with ncurses curses)
+		$(use_with qt5 qt)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+
+	systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service
+}
diff --git a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
new file mode 100644
index 000000000000..ca7c284e428e
--- /dev/null
+++ b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.7.7-tinfo.patch
@@ -0,0 +1,25 @@
+From 28eeb5e4a5d92ff913e3956550bff56f615c97df Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 21 Dec 2019 15:17:56 +0100
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ed83221..bae1180 100755
+--- a/configure
++++ b/configure
+@@ -469,7 +469,7 @@ int main(void) {
+ }
+ EOF
+ 	if $XCC _curses.c -o _curses -lcurses 2>&3; then
+-		LIB_CURSES=-lcurses
++		LIB_CURSES="-lcurses -ltinfo"
+ 	fi
+ 	rm -f _curses.c _curses
+ fi
+-- 
+2.24.1
+
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index a2e2ed249ee7..f3c463d88512 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -3,8 +3,11 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 <use>
+	<flag name="gtk2">
+		Build with <pkg>x11-libs/gtk+</pkg> version 2 instead of version 3
+	</flag>
 	<flag name="gtk3">
-		Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
+		Add support for <pkg>x11-libs/gtk+</pkg> version 3 (The GIMP Toolkit)
 	</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index aa3d3998f00d..a6b4663ebe97 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,10 +1,12 @@
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
+DIST dhcpcd-7.2.5.tar.xz 214124 BLAKE2B 7a5f32b66187afcaa2bb4a1cbcc0d704a28a27ff6d1f9fea409bab242ebf4d263d81590cb4a4959c9f1119966795e26fa582ed16a525c1e46a72dd0905868074 SHA512 ee0c70f3996f6a06031c2f663a4bdf4f147d637c31e54bb94fcb9d86282c33ad7b0f5569abe09acd7698efbb34c35afb228fe0825e4a95ad6a42832d1838ca72
 DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
-DIST dhcpcd-8.1.2.tar.xz 228736 BLAKE2B 905829d2a0066729afa884f48049066e7fd802525f5ea436f02379845c848ac84b739394dfa90c1aebd74d87842b281121503815a31d05dcaa8b48c3026e357f SHA512 190e42391bc065536d0174a4a51db63b5e7360ccca3f69524a5c347d575ca9ee8439a739f88fadc1bb2509016d1d8f27fc7c7f2cc6724774f8072431f87b9bd7
+DIST dhcpcd-8.1.5.tar.xz 229212 BLAKE2B 9b60485a673001479d21727548266440eb44e070af873d014a43b3b0f189e2c6d3d1e3c04b7d67fd45f54edf75e0e24703f0bacb3c3ae114273b8428ca30d1d4 SHA512 59c8ae255b18b6678b22d4bd5f6797ac20e762d1d22e5ba4c0aefce5ec0d4f863876c06c03dd4c5e71f4d65884474cef9c29f95658eac55097603becd96e3846
 EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B df0815025660e0500e89ca24703d2d102d160f63fe049b0b8b254623da1a46e77b038db5c25a04ff42f266c6381104cec39d22096ec38bfa95b2a2ce30a49a62 SHA512 3302777fd50a12f7a6d69fd3d66682cee889c4a41e810a42ed9c13172312101bd0d349dcbb024dea0637c2607fb29b9eb64a17747e77e70ffe116a4592487618
+EBUILD dhcpcd-7.2.5.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 EBUILD dhcpcd-8.0.6.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
-EBUILD dhcpcd-8.1.2.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
+EBUILD dhcpcd-8.1.5.ebuild 4398 BLAKE2B e6f1fcf4d35747e771896ee3c37bde2ce7e90eef8892a0d014a124fcb3dc111079ef4570eff535c86dff69c206356df8844c6b919ac9f2d7ec6aab8769d48285 SHA512 7047213143759d2740405fba60d6a617e18506fe6b050b8a34768cd850e830636045dc3ebb81704bf1ad8ec84b56004a525df0aa79cc33a7df799e3bfd68a270
 EBUILD dhcpcd-9999.ebuild 4427 BLAKE2B c57c5170026230050182276f914c22963f077d960d5f695267ea46bc54c6ef37a4809da798c897ece97d019497aed04a2ba815047ebc265922265c5edf01ff9c SHA512 c2db16bd7e6c3b4e7ba256c6e652408cc5f4257c188e3b668e27fa12e437aeed806a7d2045532ae22f124da6732aceeac65d69f17b18793a175eeb6af0995d98
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.2.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
index 97babad6cfa4..97babad6cfa4 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild
new file mode 100644
index 000000000000..4526f6e55cd7
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-8.1.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 95ce621cd46e..cedb825a48a9 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -6,5 +6,5 @@ DIST dropbox-cli-19.py.xz 13960 BLAKE2B 16d33155cbe5449434ff9fc5a9fddca9a7cd20bd
 EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
 EBUILD dropbox-cli-1.6.0-r1.ebuild 721 BLAKE2B 63464febf1675553135fa92bc0df4821015d924a26ffeb8d788057109c494340eba160bb24c96da991443772c8d9d73fce89b7852a64880be414f53c4c123ef1 SHA512 317e442fbdb8f78ff63a77ebcda2a33700ea1aa187c4d2c5fdb1d7e206153af32258d15411256eb74f4f96714e0e7011281cf039953086ea32cf4983c2177047
 EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
-EBUILD dropbox-cli-19.ebuild 716 BLAKE2B 8120e0cd8b63e36804f160bb4442816f6c634f4178f3bb79c8468b8f0a51a82e4f184b1dbd43e6c5dcdaa1bbc90c495ac1fd48a9ab77145ec2b287ab0377c349 SHA512 c451c679b825a58391f4a550800972f377fbe93eef41a947b417ca5604e7cfcc2e300844e68955ccb26d2ff3210fd9f579bfae60d9cfbe815aedde53f5de7074
+EBUILD dropbox-cli-19.ebuild 712 BLAKE2B ebc48492372029873de68176c054032a33e64947b53169328296b11165780fb8c9161daece6db2f3b8ffb6f72ed582e9812b33c5e2efc7c66c9a72b31f03b3e4 SHA512 4ddb869d74e06cb096ea55adbe055ded47a03d5a89e836a7a2e25e79441b19b42fc79a1958ef7492a2bac1a03ba1efd3d46a37eac51cc08f298c4ca2e6457afd
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-19.ebuild b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
index 068db8441b76..f7fd170117b9 100644
--- a/net-misc/dropbox-cli/dropbox-cli-19.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-r1 bash-completion-r1
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 4f7482cddf21..f6bf1f1728c1 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,18 +2,12 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-83.4.152.tar.gz 94612498 BLAKE2B ddf86853785ee4806cc96f2427a300b2db751bf3a5b12ec1508bdbc68ba7ff35d2d65e83e86b5a09ad4a7cc160e0f94e7cd141a819d35f9be87aea7f3cb8dd0d SHA512 75793878c15ecd7224f0ef1897e38c1050d36e11ddf1c30db8e79c22dcb40ceed48fd6e4be204b19c54fe4ef7a2c68d5528df6e10a041cbe4220d9c129619a4b
-DIST dropbox-lnx.x86-84.4.170.tar.gz 95127426 BLAKE2B 09f985565839c5411647fba7eaf84c88a69941456c6e64b23e6e2ca0cc21b8f393153210db23be7ddc4ee0deb3771c9af8ac2b5fefb2325227e8ae3b52a3be0a SHA512 69ab398860bd7559d971ecc42a271a432839b00ab920b8c068d317d420bd521b1ffc1c74912c98d56627b72cd972c059a5eb0ab89c53bb50ab766179baeda448
-DIST dropbox-lnx.x86-85.3.138.tar.gz 95798182 BLAKE2B 25cda9b6841c027b3dc919606b7f9c7aa6cba4f73949068792e613f46db20a6c6e4d9dc5e9b8f0c565c9c74b786a3bcbbc16cce664f79d80ca2b291d8ff996b7 SHA512 e1c3b91b8b81a13468a2041d73f40feec31d25a860031d3e3f415692389739c73eadbbb4e37827452b7634559a314674e1a595ebae47d793a87245fef11193fb
-DIST dropbox-lnx.x86-85.4.155.tar.gz 95826112 BLAKE2B fc20ee2495729a573a2c5b02672690a0d012a1a3b1509bef2c9089ce4875cc559e00fb43f66d721e1d18d9b7d431ff15a194469fa7f72c72022df985901b9150 SHA512 640ac43d382796aeb68ef41fe83493e777492e1d1f20694aa49fb5682dae30087f411eeb60bf7d35ecf48ea94cf38dbe4543f8d179756efb86abc47543043d1f
-DIST dropbox-lnx.x86-86.4.146.tar.gz 96400468 BLAKE2B 42ff29c98fbd5c7517a5156af421d8e6deea02772818e744081f90abc259149b9e84e1642a20ab8098bee7ae00d602d8f458f7f825b7a1a748527cb6691a1738 SHA512 6fdcdaf899e9b7f3ea64a7d4ddce276e949b5452b0cdef5b45be44d8fcd16fd1c2af811f38185e636915bc5c71cd0ff306e069f9ef73b1130fc033dd8fc53be1
+DIST dropbox-lnx.x86-88.4.172.tar.gz 97905927 BLAKE2B fe40384888edb4c9bebc1a1af54b58e81466cecc309191bca018213c756129d18a26eb550c1c16a95f858a30dd07868be160502715c7f1bba80393dd030a9ec1 SHA512 4475a28420346cc6d0524f454cc6f25b863aab86a71a5153dd40a5dec6dec2d17e04124adaa128812ae6e944998d8d50c62cdf7c1f459d39eb2626cd6234e875
+DIST dropbox-lnx.x86-89.3.268.tar.gz 92308961 BLAKE2B 4b1a229eca8e96b49360404fc3a03277343f1dcea9b2065b637d8531b266233215e3f3c21163d20ed104db90b4d37dcd873bc1353036a14f89ac50b78180a518 SHA512 25195ef1f44641ca3aee00c4b5cb52006d9610b9d067ea1ade4717dd47729db98e5b0556b5c61ea881ee84e8f8aafec868555591d8d3f4c1ecc81974159e3321
 DIST dropbox-lnx.x86_64-83.4.152.tar.gz 98772192 BLAKE2B c023fe81128217b8e11b287afdf6d5cd74d7dd4229c7845aa8e96065f03912720dfe3531995bacc45c50a2971dac0bb7e10364206c531fe5f4e23ce6c617a1d4 SHA512 55874247f3dcfafc62d07aad459a6b3d951c87e675a28f6e66c9c51c9190ca8e4dc32bce5339e338694d31036bc8e1b039f54460b84bce0ee1fff9dd3d6aa684
-DIST dropbox-lnx.x86_64-84.4.170.tar.gz 99360343 BLAKE2B 05dd47e681f03757a622079121001060a73f4c0415fc6508d74738026388f8d27f4b59b41535280a793d2f95976fbf6da9e1c0ec963cc002ad2f14ab46dd73be SHA512 e89e6b727699a439c7cf1fed57f5c7db6fd98c7ef484c9530b2c4ce0b09a86de59a50934afd4d18fd591db024eb92d57181d75574d3d32e587dd76682524b871
-DIST dropbox-lnx.x86_64-85.3.138.tar.gz 100138034 BLAKE2B d7499b31afa7c8cac56d0a785b083c187ce97946bee8c76020bc277284c26e0441477ea9988d3c1928aa706a5519eb7dba9e55bbaed62d192c2383c2b0e86e4c SHA512 94890e958173c76940ff932744af267096327f37c454c913ffcda4b4b9815afeb0877e38fea6be99b7f0d53a6951f72e0400a9405b2b65e8c7d9c5c197a6d1d9
-DIST dropbox-lnx.x86_64-85.4.155.tar.gz 100174580 BLAKE2B 247d9c429f160cc3535a5741ef150e81f499ffa44fe68a7836255d4679c4a75532ffaf68b3f2d8e9b73ee311536c8c25148c370232b52fdbf2b945ae64908446 SHA512 870b3f1b2a6711d2e797a485db9fdbb78e63c9a66b240265f2ef5c907caf00a7cd748f796861fb2bcb46123bd00f52d7aa022fefbd5bb959cd1f966e270adae6
-DIST dropbox-lnx.x86_64-86.4.146.tar.gz 100750434 BLAKE2B 5b415e3a06aefd8851ec3fb1389ba89fc258609e0026592de2d2fea074f14bfbe5993a5296b6637ca28df33e9b90bfed7d986b270162e11b23e202676cf85ddf SHA512 6c6a7ca84dbc802405e05e56481f3640fd0837e757138aae7ad004dd545e5773ca0297d7ab8e23f2e843958c2c85f3cea6216098d769fbac926578a9ae1edd97
+DIST dropbox-lnx.x86_64-88.4.172.tar.gz 102549714 BLAKE2B 32df6ec80ff6d5e841bdb8620af2b4a0e820f879b8c104e79a861ea4540477de7e5d68504579bb134c229f433f5472f61663ee7508c1f9cbaa1a2363e8cf93de SHA512 0af742edce083a61c1abf57f93bab9e849f9aa8653e1483e7ca9058580b60af17d8566f650f86ae820c686052acf676c7b76f79ca575da719a64c0845764f04c
+DIST dropbox-lnx.x86_64-89.3.268.tar.gz 96723713 BLAKE2B 5bfb7721303b466f9015709f1a235045263fa0db46ff4f0ad7e772c4dc1261b8c7549d63c0ac4a9d98e35581c630ad5ed851d0c63334267b196bec7dc93c0ddf SHA512 627bf49df5a6da76bf04484912c7be686f4e9adc51be619fd613b56fdd514088c173c39cab5fb5a6757074130efc54edf192c7df43090965ba9066de5d0f1755
 EBUILD dropbox-83.4.152.ebuild 2857 BLAKE2B 4018ebd8749c24f4b321789d6c31c990f83757381f54310b755eb46d218b0fc227f7d97e106730c0da9891e53070d25f803239ec805a8abc73e66ffeb32d18fa SHA512 b4208396c6bedf47278f0507a5c14c9ac184bf8a91d2a8433708178c4c92484d26fc1d32dc3781f8a85623f4dcea8dbf2e9f34720ca76c695c0e9cf2878629e5
-EBUILD dropbox-84.4.170.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-85.3.138.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-85.4.155.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-86.4.146.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-MISC metadata.xml 503 BLAKE2B e87633e1962a70d62a58006f874a93170d1a5e2729ef6158bf44ab331b5dde53c848266b942fe21579bdc83fda10a421795f630276b96e1c71a954a54ba3436f SHA512 b766938aa2c74e5e9d4558fe882c2d0354c14c9744a7e5eac664ed5234cb723601fc5d04d65e19877c3bb60d8bdaa305eb1c8273704ac2fa1a5779de60d9484f
+EBUILD dropbox-88.4.172.ebuild 2843 BLAKE2B bf4b8501e9144bed80fa3b9ba208c2d3b5c8f4046f951d7b517742df99b8a4ea1ec46f89f657ad345d422e30ad563f22c5e40b97cf0e124feddee02bbd6ac4a3 SHA512 c006f1573e14c4651d33c2706729869d2d164a25b81e7fdca48b033882ff43e5150161850f153b9107739c76fe5aab1cd524c241a8197a9de4cfb610a17b3e26
+EBUILD dropbox-89.3.268.ebuild 2843 BLAKE2B bf4b8501e9144bed80fa3b9ba208c2d3b5c8f4046f951d7b517742df99b8a4ea1ec46f89f657ad345d422e30ad563f22c5e40b97cf0e124feddee02bbd6ac4a3 SHA512 c006f1573e14c4651d33c2706729869d2d164a25b81e7fdca48b033882ff43e5150161850f153b9107739c76fe5aab1cd524c241a8197a9de4cfb610a17b3e26
+MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-84.4.170.ebuild b/net-misc/dropbox/dropbox-84.4.170.ebuild
deleted file mode 100644
index c21396bd015d..000000000000
--- a/net-misc/dropbox/dropbox-84.4.170.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/libffi-compat:6
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-85.4.155.ebuild b/net-misc/dropbox/dropbox-85.4.155.ebuild
deleted file mode 100644
index c21396bd015d..000000000000
--- a/net-misc/dropbox/dropbox-85.4.155.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils pax-utils systemd
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/libffi-compat:6
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-85.3.138.ebuild b/net-misc/dropbox/dropbox-88.4.172.ebuild
index c21396bd015d..7a750370139e 100644
--- a/net-misc/dropbox/dropbox-85.3.138.ebuild
+++ b/net-misc/dropbox/dropbox-88.4.172.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
@@ -76,7 +76,7 @@ src_prepare() {
 		rm -vrf PyQt5* *pyqt5* images || die
 	fi
 	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
 	else
 		rm -vf librsync.so.1 || die
 	fi
diff --git a/net-misc/dropbox/dropbox-86.4.146.ebuild b/net-misc/dropbox/dropbox-89.3.268.ebuild
index c21396bd015d..7a750370139e 100644
--- a/net-misc/dropbox/dropbox-86.4.146.ebuild
+++ b/net-misc/dropbox/dropbox-89.3.268.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
@@ -76,7 +76,7 @@ src_prepare() {
 		rm -vrf PyQt5* *pyqt5* images || die
 	fi
 	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
 	else
 		rm -vf librsync.so.1 || die
 	fi
diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml
index c92c1a213687..690936c39b8d 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/metadata.xml
@@ -5,9 +5,6 @@
     <email>perfinion@gentoo.org</email>
   </maintainer>
   <maintainer type="person">
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
     <email>bkohler@gentoo.org</email>
     <name>Ben Kohler</name>
   </maintainer>
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 9059c97bfab0..58752e6914ed 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1.ebuild 669 BLAKE2B 67f4294d07535d80c2cab9355fe933e0ddef5261b120ff2ae624f7b9f2541649abc6196d73c7cd892087f7c53047bb6b6259b595a18adc38dc1d88156938582f SHA512 279f4dc4688fc1888b45ba87e6b9981aa56f279b886c9915bd4fc3bcc7a6879d7af187466872b8a83f7d75a0a51784b86ac473a0e76ea13bcccbfe8a3bb943ee
+EBUILD econnman-1.1.ebuild 669 BLAKE2B 56a599676b5f6ed7fc371ab0b4adbedb7ce87ce0c563f90642dc3cbbec3f2d84762993879f9db21a673c3630281f600b265b1095040b24e2894f475d53aa36ca SHA512 6ea1b01ff4b21bdac0a4fbd35675a061e72570e42afad841261e3994c6637119906225ef229fa6eb896d529100b13cbc5b4b8a7a27c7ccbdbb4090b7a322cf83
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1.ebuild b/net-misc/econnman/econnman-1.1.ebuild
index d014d49e35c3..6469ce52bbc6 100644
--- a/net-misc/econnman/econnman-1.1.ebuild
+++ b/net-misc/econnman/econnman-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit python-single-r1
 
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index d111f5fc72b1..cc26286cb9ef 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -2,6 +2,6 @@ AUX endlessh.confd-r1 1334 BLAKE2B 978cb9746acf2ab5aba7bff766a11daa347daee14bb5d
 AUX endlessh.initd-r1 657 BLAKE2B 1954581b2434437d1fbac539a4cf0ee7dd8c59f4eab9a5e7f0f2549ead3ecda062810b9ecbc25b4bd8928e9e0aeea42ff6a0e64be2628313fbaa1a55e1feef11 SHA512 0e7e4306a4b9bfde080647ba82e0f0e4b828a787926d6cc78189a25b0f5d2de4d95433c960f23e4c16ceae0d7cf67a8be69323f04d1911393b88400a9498ba48
 AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe6c9d2c97a5e434302ef1dae8341bf37f9fbdfe1f12bb73a589c0817dac033714d04ccef337cb8f SHA512 4961f3ea7dabb66a0ba6a650ed21bef9d4bd2289d15d5b3367b31524480d4c63275cedcd2f39202353f302fab6310168529560975b23a8699a2b7a4e6bd4abad
 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
-EBUILD endlessh-1.0.ebuild 1336 BLAKE2B 633542e55f0676a2747ce98dd0f4d61b440ebfbddd4403133a2369d48d516e79dca7b9299f7af4fed9cb178707bf7eba0d10157ef803ade97dd070a81ab3f806 SHA512 211e5c05d1d6b14640fe916bce38f20df433eb981f3d5ad02e88ee49d890b0e31231ae6a5fa62cecd9f04cb692c3ad3805c1a308e41eb399c32f0a4b6e792e42
-EBUILD endlessh-9999.ebuild 1336 BLAKE2B 633542e55f0676a2747ce98dd0f4d61b440ebfbddd4403133a2369d48d516e79dca7b9299f7af4fed9cb178707bf7eba0d10157ef803ade97dd070a81ab3f806 SHA512 211e5c05d1d6b14640fe916bce38f20df433eb981f3d5ad02e88ee49d890b0e31231ae6a5fa62cecd9f04cb692c3ad3805c1a308e41eb399c32f0a4b6e792e42
+EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
+EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
 MISC metadata.xml 931 BLAKE2B 0796a43cb19ba6da07434a782da24ab45e216a547042c598c9c7e090e5ceaffa7a69ddbe4e3466eeaf7e4d14d0bb3b8457d0db45b74d675f31a17bad281b1a7e SHA512 adeb45ea9169f3c9c52e2131ea51b2b357c3f036edc28baa1fd312ab58313d4208cfd75f01fa39e2fd045d6587d9167a76e530245c0d650a27c50fcf2c2e3410
diff --git a/net-misc/endlessh/endlessh-1.0.ebuild b/net-misc/endlessh/endlessh-1.0.ebuild
index e0a840877f36..c9996640c02b 100644
--- a/net-misc/endlessh/endlessh-1.0.ebuild
+++ b/net-misc/endlessh/endlessh-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild
index e0a840877f36..c9996640c02b 100644
--- a/net-misc/endlessh/endlessh-9999.ebuild
+++ b/net-misc/endlessh/endlessh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
new file mode 100644
index 000000000000..173928861466
--- /dev/null
+++ b/net-misc/etherdfs/Manifest
@@ -0,0 +1,8 @@
+AUX etherdfs-20180203-makefile.patch 578 BLAKE2B 2d62c0f3ebca6915293f97028cd008fde57fadc490804d2acd92458ffa5479e3cf4fe4af907a938207bfc03cd269cce570a293ec06c53083a57032c259049e83 SHA512 88eb8922684645205250b96dc265fd23262e448c53b94a80c1b68d282b980abbcbc01d612098e4c8e670d98973982d6a10b2739ae043876c2436934b4b25102c
+AUX etherdfs.confd 345 BLAKE2B 4e299984a7680aca036a80e5e0c5efa5ae699de0726dca8ae7368e214a0d3b4f6d90b10ac46f29d8d29d4f6b5aa7547e38d6371fc95d63bc0488a1d4d88b72a1 SHA512 41f2425c6ed387414a9ccdacfa259b55f9089effff4028e849a897a13e92013fcf705e50120d88cc7af183f3af3dc4a2359b0f6516c677298a31201ffcfdb6ea
+AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cfa6579e0cf84f9365f47dda26a7c84a0989312e9384befe8131b97259845e38cdf2bd84056c855f0 SHA512 b30385aa569831ba0989cf73bd35321577116a77014bcf1d6235b7ddde039ccbe822b590bd8b2da2ffccf5c9161cb977aaea810f8b49126e64265ca77b82c20b
+AUX etherdfs.service 210 BLAKE2B 0e3243da13f6be2251239fe43a5c675388175a1e62d4119cba30a2a35f6ca69572ff3176d944e39d55e442cb3cd1b599a8ce6d09bbd5ddefb9bf0c67aff216d5 SHA512 13a555a8c4e82f3b033d946f82064fcb0c3d026393da8abcff9336e6a20d36b2185fac3b3562dde59260c43b8a45b1c6dd1e95faf40abc870605e50f0fc8b381
+DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439
+DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e
+EBUILD etherdfs-20180203.ebuild 1020 BLAKE2B 00b1fd05f98d20dd9ee4d8ae551fbe7249f6bd9e83d6c970c746ff31b6f64a60dd50768758fe6a307379a74087f7c889a4cf48d1d2ed52717ba5e4de2efea397 SHA512 8716e45c3c032ac46aae5a73d07a3440de8d629ed2c9d781bb96c0c83a21ff5b52bf097129bd873c72096bed983d99589ad92e77ba08bb0a3650ab7b3389fbd1
+MISC metadata.xml 628 BLAKE2B 098bc7b2760258e6eb715561d32f0c2674e2e0ceb4a755d1cabf695bd938f68a9a1809f232ce136a395b00b5055b7ea31bbe7db0f1206ae5a435340089a79cf7 SHA512 1a8106a9ce7418f4a118cb143dd8605a84c38376edad4583dbfafab913738dc96e26c6e24cd65e29d408cb975f2741d37303bfbf3c99d2a966376486db526dcd
diff --git a/net-misc/etherdfs/etherdfs-20180203.ebuild b/net-misc/etherdfs/etherdfs-20180203.ebuild
new file mode 100644
index 000000000000..5a35f39a6a70
--- /dev/null
+++ b/net-misc/etherdfs/etherdfs-20180203.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ethersrv-linux"
+MY_PV_TSR="0.8.2"
+MY_P="${MY_PN}-${PV}"
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="An ethernet-based file system for DOS"
+HOMEPAGE="http://etherdfs.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${MY_P}.tar.xz
+	tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tsr"
+
+BDEPEND="tsr? ( app-arch/unzip )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+DOCS=( "ethersrv-linux.txt" "history.txt" )
+
+src_compile() {
+	tc-export CC
+
+	default
+}
+
+src_install() {
+	dobin ethersrv-linux
+
+	if use tsr; then
+		insinto /usr/share/etherdfs
+		newins ../ETHERDFS.EXE etherdfs.exe
+
+		DOCS+=( "../ETHERDFS.TXT" "../HISTORY.TXT" )
+	fi
+
+	newinitd "${FILESDIR}"/etherdfs.initd etherdfs
+	newconfd "${FILESDIR}"/etherdfs.confd etherdfs
+	systemd_dounit "${FILESDIR}"/etherdfs.service
+
+	einstalldocs
+}
diff --git a/net-misc/etherdfs/files/etherdfs-20180203-makefile.patch b/net-misc/etherdfs/files/etherdfs-20180203-makefile.patch
new file mode 100644
index 000000000000..1cbf51cb65fe
--- /dev/null
+++ b/net-misc/etherdfs/files/etherdfs-20180203-makefile.patch
@@ -0,0 +1,14 @@
+--- a/Makefile	2018-02-03 21:21:51.518384435 +0100
++++ b/Makefile	2019-12-27 01:23:37.030323263 +0100
+@@ -5,9 +5,9 @@
+ # Copyright (C) 2017, 2018 Mateusz Viste
+ #
+ 
+-CFLAGS = -O2 -Wall -std=gnu89 -pedantic -Wextra -s -Wno-long-long -Wno-variadic-macros -Wformat-security -D_FORTIFY_SOURCE=1
++CFLAGS += -Wall -std=gnu89 -pedantic -Wextra -Wno-long-long -Wno-variadic-macros -Wformat-security -D_FORTIFY_SOURCE=1
+ 
+-CC = gcc
++CC ?= gcc
+ 
+ ethersrv-linux: ethersrv-linux.c fs.c fs.h lock.c lock.h debug.h
+ 	$(CC) ethersrv-linux.c fs.c lock.c -o ethersrv-linux $(CFLAGS)
diff --git a/net-misc/etherdfs/files/etherdfs.confd b/net-misc/etherdfs/files/etherdfs.confd
new file mode 100644
index 000000000000..1a5a116e8412
--- /dev/null
+++ b/net-misc/etherdfs/files/etherdfs.confd
@@ -0,0 +1,9 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Network interface, which should be used for serving mapped drives
+INTERFACE="lo"
+
+# Storage directories, which are being mapped and served to the client.
+# Multiple directories can be specified, by whitespace separated.
+STORAGEDIR="/tmp"
diff --git a/net-misc/etherdfs/files/etherdfs.initd b/net-misc/etherdfs/files/etherdfs.initd
new file mode 100644
index 000000000000..dd3b0b27d5ac
--- /dev/null
+++ b/net-misc/etherdfs/files/etherdfs.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="etherdfs daemon"
+command="/usr/bin/ethersrv-linux"
+command_args="${INTERFACE} ${STORAGEDIR}"
+
+depend() {
+	need net
+}
diff --git a/net-misc/etherdfs/files/etherdfs.service b/net-misc/etherdfs/files/etherdfs.service
new file mode 100644
index 000000000000..d5a6ed474a6a
--- /dev/null
+++ b/net-misc/etherdfs/files/etherdfs.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=etherdfs daemon
+After=network-online.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/etherdfs
+ExecStart=/usr/bin/ethersrv-linux ${INTERFACE} ${STORAGEDIR}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/etherdfs/metadata.xml b/net-misc/etherdfs/metadata.xml
new file mode 100644
index 000000000000..e9a40ff92f91
--- /dev/null
+++ b/net-misc/etherdfs/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		EtherDFS is an 'installable filesystem' TSR for DOS.
+		It maps a drive from a remote computer
+		to a local drive letter, using raw ethernet frames to communicate.
+	</longdescription>
+	<use>
+		<flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">etherdfs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 9ead5bc98b42..3a7a8a98fe1a 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,3 +1,3 @@
 DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302
-EBUILD eventd-0.27.0.ebuild 2578 BLAKE2B d68a65ea250e4c645589b39a81fe6741fc94a1558b31f68ddab57349bf3092c45faf74bdf831f7612f0b109bff5373404fe6e4beb56e6ce4c016a51d861d0ccb SHA512 518ecc6191e0ab9324ed678f7739f3310a397079682e2fb6d2fd930cc80d59d89088e43afeec4b22f8864a55f22bb9656ea83873e2d4f8d4dd39d7b350f25ed9
+EBUILD eventd-0.27.0-r1.ebuild 2583 BLAKE2B 25ea89312ae77318d0114a9f80e114d5c42779b277f4e66358d42f0ac3f611fdf03e1f4a3c9ff7e0dc5111af9097231fb6b081c370e255202198ccdf5094ab20 SHA512 8d2c26e4be8436eb9a2dccabac94eb662d7fdb0a2f8acc6c30401d2d0c9a0d58a3a9f7d44a5cfb26958d24234f687e0fae0e21c29230012c4c997cece551e413
 MISC metadata.xml 907 BLAKE2B f615133974e8aa1afefed00bf6d5e856b18feac63189f8c338de145145c10870de3bf45a764c53c9003fbac6215961ba9e4ca8898c0e2089545a20bc3b147342 SHA512 9132a923a1c3b140374a480473665aa85ab0a9d8f7aa74298a78b4905c5d2bbb97a0fa9d8564c600a9023f64e67151ac47b9443c55e6e7642bbebaf22da061aa
diff --git a/net-misc/eventd/eventd-0.27.0.ebuild b/net-misc/eventd/eventd-0.27.0-r1.ebuild
index 3ddb82d0f980..b7ceae38f1fb 100644
--- a/net-misc/eventd/eventd-0.27.0.ebuild
+++ b/net-misc/eventd/eventd-0.27.0-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 		x11-libs/pango
 		x11-libs/gdk-pixbuf:2
 		X? (
-			x11-libs/cairo[xcb]
+			x11-libs/cairo[X,xcb(+)]
 			x11-libs/libxcb:=[xkb]
 			x11-libs/xcb-util
 			x11-libs/xcb-util-wm
diff --git a/net-misc/fatrat/Manifest b/net-misc/fatrat/Manifest
index 662370f6509f..aa5d34665c92 100644
--- a/net-misc/fatrat/Manifest
+++ b/net-misc/fatrat/Manifest
@@ -1,4 +1,4 @@
 AUX fatrat-1.2.0_beta2_p20150803-build.patch 357 BLAKE2B 31a7da4cd3d49f3ebab037bdc8b32708bc7454bd46ee49ee3582ffc0cad9816dc7ca575f63039c17d2e0f06a455204ccf19197a01845231362a8f6e049cb3de0 SHA512 884c79a2b40ce0aa3748df8df7e7ed5050a56cda23922c3cfbae0987a192fe1d2320d059830ed6de88f527dda87ebbc9033a73f5f12d269e93e1c3deffb0fc3e
 DIST fatrat-1.2.0_beta2_p20161204.tar.gz 4988560 BLAKE2B e55b841bd5741fe81eab79847dddf084a0b193215b791c341d705d840d1658bb7978e53c3de65c23c7c1ac839b29abfceb3b71bcbb124746e841c5fb31ecba14 SHA512 d3a9816cc53fd93ef2ccd3fb5896dde5846382d40e30dc687a14379e6048f8ffc27b40c2b5c3977c6bccc912dcb054426c84c016c319174e2c2a440f9a588063
 EBUILD fatrat-1.2.0_beta2_p20161204.ebuild 1532 BLAKE2B 24d754216aacc9fa26b6b49ec616833c08bc116c3f708956fa14c2f0080cb0d479ca1a06e50c3064fab696f066ebc95ab747f476d33b4242aab2d8ed0ccab320 SHA512 bb2c8966a19f0551546b3a9b3e698676ecf97a7684b8c97aca8b4d5290ca0c5485758c6cb08171b31af44669efc862e08b66545f1c49cf996f7d50b73e041cd3
-MISC metadata.xml 555 BLAKE2B 05c511ed04d858386768695fa5405b8492d5195b0f534a0d8fcd23d701b0139de2529031c7a6c0c07e9b7a9bf018741e0bf7a09cac9f0a4a0b4d74e63e9d8662 SHA512 908bffaa9e59275d709dd0d470567dc5a2eb712766bee6e75697d60554d5ff66db58af7c067329f1ab76ce0a9858a57929418c014937e532d62264d3f14b4615
+MISC metadata.xml 471 BLAKE2B 7dc41b9e28a689ca2eaa3c68a7227406732a44216916512d0d0e45a88ada0d9e5f624ec548ae7d65c20d7c86775354003ddbe9578843da79746b528969e6d0f6 SHA512 ad697e54c2a17fd924bf31d557a71db942df499da67637e08dd5f2f8c6c5da76ed4eaef209bace83bd833a2694b7ab4956208ff8586a3e14828fd51e7532541b
diff --git a/net-misc/fatrat/metadata.xml b/net-misc/fatrat/metadata.xml
index 2b0630af5171..5560fa5bf5dc 100644
--- a/net-misc/fatrat/metadata.xml
+++ b/net-misc/fatrat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		FatRat is an open source download manager for Linux.
 	</longdescription>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 16774ba4a927..e6b6b4570f3a 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,6 +2,8 @@ AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa
 AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
 DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
+DIST freerdp-2.0.0_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
 EBUILD freerdp-2.0.0_rc4.ebuild 3000 BLAKE2B 1b80dee002f09b3a77eebecae80535944d1f37d427e27b04d9556a6d8803b9cebbea728a46e681a0db1cbdf6bff1af86f8bdc9ecc40cf0673e6a540673b1dfb3 SHA512 16659cbbfb54506ea7e94cb76400e7c2e4592f39b785e66d40e7930441de28477317ae293b9908d844094634ed58b88a3d5982fd6ed07b8c473498d130169bc0
-EBUILD freerdp-9999.ebuild 2958 BLAKE2B d6bdbc6c4f93ca0cf0a5552cb8df38da2ed6072e73956acabb9ea2f09e09fcdc372d4c374cf52bd6f1a27015ab1e94db8976dbbbf720b4469c4ab3aa03e9f2b9 SHA512 504105d55395458877e5d0ad5a0160a83bc9569cc3dfc04ae5b280a5acdc3c440ff8047cc25e79f04e11583862398fae7fc0927ba67a90eca4cd1f10ffb4639c
+EBUILD freerdp-2.0.0_rc4_p1129.ebuild 3026 BLAKE2B 52ef38105384c0ac40f4a83db2d01ee4bc5d06f34fbd26336a93ea5f96bc4c9b522d31f3c60efe2d3146c1aaa51919f905e3a29ebdddee3191cb53edc0f68fce SHA512 cd483f12fb1b591c2648f09b056c0b380d63e0fa31b59d309ab2bb2abf57de654fe31313719bfb35380e3146faf63553a7adf01c296bd07f2c1451f1eaed54ac
+EBUILD freerdp-9999.ebuild 2953 BLAKE2B 3dbd7d6b1d1f1b7ce4af442a0f4e5a276e4c5b56c511fefd648a100586749ad9a55a64e29af83929b189b02a0533bfe4df2c03002d91735d2c59f15d81f8ae39 SHA512 a25f0e46d7fa99969dbb8c8c6a9931759582b015ca711b2710fffd70e30e34565c78cfc6f35b21829a124eb6e6ce72ff7e8f028ef981a7503f26134badd1a2f4
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
new file mode 100644
index 000000000000..4ef50289d0b5
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2011-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} != 9999 ]]; then
+	COMMIT="483d09b760bea529972afad9b6f6c7a89dcffd40"
+	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/FreeRDP-${COMMIT}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	client? (
+		usb? (
+			virtual/libudev:0=
+			sys-apps/util-linux:0=
+			dev-libs/dbus-glib:0=
+			virtual/libusb:1=
+		)
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			xv? ( x11-libs/libXv )
+		)
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	jpeg? ( virtual/jpeg:0 )
+	openh264? ( media-libs/openh264 )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	client? ( X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) ) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CLIENT=$(usex client ON OFF)
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 0bc7c2735df1..1ca075a5d92c 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
@@ -118,5 +118,5 @@ src_configure() {
 		-DWITH_XV=$(usex xv ON OFF)
 		-DWITH_WAYLAND=$(usex wayland ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-misc/gns3-converter/Manifest b/net-misc/gns3-converter/Manifest
index e10967ed5af5..086d8d50cc1e 100644
--- a/net-misc/gns3-converter/Manifest
+++ b/net-misc/gns3-converter/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-converter-1.3.0.tar.gz 45837 BLAKE2B 9265773c941a0b3a364d912498fb1c7188259c4ebd244d688fe6a7f3a3110892adfb6e045d1f11938aa0f79c72721020a74e9a0bc297f93e44fee2bd7a3e3526 SHA512 ac2e44b3f02c8f0429158e11c964bf342973809139dcf34863071905400964006d7adbc3ddb80efe57a5ecc5eaf59e228bf7d07a7e5776dd6bcf51b4e1d3fe57
-EBUILD gns3-converter-1.3.0.ebuild 511 BLAKE2B d36fbc6e190d0ba30aec3de1ee39ad745d5492016503f0d01ffad114f86c3676666c2532e673b8d4a887bf665fde8bcfd1f32fd960d1700d401024af5e92a7f4 SHA512 2cb36d55add5a3830456eae477bd1e7669105b5c2085bd7aac9af1925931b28e210622b2c24911489c65579e181b41f3f4d28174ab90ba66ef379acf210227e2
+EBUILD gns3-converter-1.3.0.ebuild 507 BLAKE2B 559ea6639d1a787b2baf4180541d3b41d76666e3170d7b67adb01b5872fe60b643340068001cb508a2d28ee4f199615b01e7370a16ebe4025ff2f381016e8b03 SHA512 44329962dc38d396459d498d6128b30c25fd27bfdcc31b60b9d06fea2cc80c806b1d33606fcfbe78cec1e673863aff5626e2baffb9744dc5c4b68c5c29fd33ce
 MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
diff --git a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
index 79b809e247b7..d455267e6c1b 100644
--- a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
+++ b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index eee4f5ab7574..32e4185de771 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-gui-2.1.21.tar.gz 4845512 BLAKE2B 93af250719a0aafe8645926552c61d43152e5a5620d42b4d73cd58d597b3280d11935043771f15cf04e5d116f6740d929e04c27b1af6732d65b7c6e36313ed3c SHA512 b9b03c59064214323fe7375256075c56368747c8cd273bea41791b101ea7d6b877443e81dd57f13faf4b4bdc6de558e98648770de4734b1edd1c82911f2fcb9b
-EBUILD gns3-gui-2.1.21.ebuild 915 BLAKE2B 9a55402171d9a52e67057673002319626084b9a642b2c2108a46b202e30efe54fded242c9196f8e09772476199f806bdcea4b589647477501dd83f72e119f63f SHA512 1b3dabbe063d682cbab05eeed15d088f46fcff99825bbfe6ab8198b3b7498c655c881e02e88c900f0841c0f20a40c3b29e3c3ae87698d88f93e9671c6266f29f
+EBUILD gns3-gui-2.1.21.ebuild 911 BLAKE2B 9295057c120516022ed4e9fd03e66eb0eb82c754f6fc4d8da8028a5c180a3765833a65b6814873b5394ad0da6659300a4979cf653269e04af371a762d170cffc SHA512 b74a0ab797c8a2b9959db94d301e0bd06b7b3c12aacf7f4e6d98a41616c5ff194d2e3f203f8517e011c75c61ba8eaf8ad5ea387ec432a687c69a52fdee0a40f2
 MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
index 0806d5aeefb2..941d10b41d49 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 desktop
 
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 4e3dd54c7c53..fdf1dc403e52 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-server-2.1.21.tar.gz 1713993 BLAKE2B 719306e05fd86b22b7413a60eb6fccc0d16a25cc3a34850344124433d0871bce5e85b195386615c1eaebf083295775de4031eee93c477bb8bd07078b839b2ee1 SHA512 3aeb7609f0fad3cf239a4de24affb124b5bed4a3af78c6a6e287a1b771e206c476849a04cf4ab731ce4923ca072d66928068fec5720bc0eb81d6819ed63f71c8
-EBUILD gns3-server-2.1.21.ebuild 1867 BLAKE2B a3e8742132ee6b1ea28c1776351acd7f37579859334abba52ebdc9bb987404b7cfddb56059853b8fcf9f7d747343767df4b90837b32d7e33375aa47e3ea56210 SHA512 8b1e094e3c63aecfe8de74a95052ed7607f872a84492010b349565b7a6fcb126ae9b058fd4149edb2f89638a751708de6c8ac72735894a20f7978a82be132e88
+EBUILD gns3-server-2.1.21.ebuild 1847 BLAKE2B 5cdb83591ec5de58891ee16042dc62947e5cdcbe510d19ac23b2242a473aa092fbf0897ac5b110d2f553febe263706ed0ef4538265adb744984ccefff21230cf SHA512 e83d1c9a44ca0ea70547809d04e4021c1ec7190ff5e5ddb9c58e1ed1cfe756016a9c82897239ae4e1c01a18a3d0284b5588c6fda62dc7f3297c091fc96c08c3a
 MISC metadata.xml 562 BLAKE2B ceb6caa8dcb6c506ad0834282075e35a399502c1c4f1c6886223c886d1405f93718439332ede39f1c18ecd169a61af862a128af9ddb6453ef3dce176de9835f2 SHA512 e2113aa60bffff0f9499d300dcd39799f4d096eedd9e2b6212573e4c64bd997d7df1c36c4f68e0d40ac900d59dbec79f44ff34289421b2a9179442e0f06f626c
diff --git a/net-misc/gns3-server/gns3-server-2.1.21.ebuild b/net-misc/gns3-server/gns3-server-2.1.21.ebuild
index aebe51927092..473d48502085 100644
--- a/net-misc/gns3-server/gns3-server-2.1.21.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.1.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit distutils-r1 python-utils-r1
+inherit distutils-r1
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="http://www.gns3.net/"
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index c1d4d361a876..cf25dad12090 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -2,6 +2,6 @@ AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c155
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
 DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
 DIST gsutil_4.45.tar.gz 3695514 BLAKE2B 9b129ae1e87620b2430368818929fbd884319cd2cf7788275ba556f873b13700b9333c59b753202d8c88a81eaa47e223f39f6ded26adf8d16144324763528886 SHA512 9b21162afcfcd063976be51151d1d51aaeac1a32c2b7d0ee79aaccb28f5202f93623b39ed994bd796ab508a56363fea69429fe42cd770cff3c7c8352a4956212
-EBUILD gsutil-4.41.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
-EBUILD gsutil-4.45.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
+EBUILD gsutil-4.41.ebuild 2603 BLAKE2B 6c8c12d7c3f8b5898822cf82f2851ed5f9d4e12fb046d160b7e4be73a61f7e1ee1ceadbde7198dfb071a15e63339b2994bc80ea18bf7b1de6bb7c2d7e6751b61 SHA512 d05a734bbc1962c6d09f5b8a9b47c55bec240f98b32d10acc01ade4ede0efea8b5737049983ad8bcb3f080a029763d6c58c1fa853bdc0cf054be572ebab6070d
+EBUILD gsutil-4.45.ebuild 2603 BLAKE2B 6c8c12d7c3f8b5898822cf82f2851ed5f9d4e12fb046d160b7e4be73a61f7e1ee1ceadbde7198dfb071a15e63339b2994bc80ea18bf7b1de6bb7c2d7e6751b61 SHA512 d05a734bbc1962c6d09f5b8a9b47c55bec240f98b32d10acc01ade4ede0efea8b5737049983ad8bcb3f080a029763d6c58c1fa853bdc0cf054be572ebab6070d
 MISC metadata.xml 514 BLAKE2B b37a6acae57aa619dd2adc4722283fbf1f5076ed9b3fa18558fdbe0d9ea39eb9fd1e0a678ce2df59c2c37f444558f9e4d1e913be7c7fdf1b2a16f31e809b7588 SHA512 d97ecaa80d5996fb0bb424681861e552c4f3ee206ec0b5d7a4f703247ea495e0a201757ebe4a5288389cab58208ead2718288107cad173684f37ecb9357bf06e
diff --git a/net-misc/gsutil/gsutil-4.41.ebuild b/net-misc/gsutil/gsutil-4.41.ebuild
index c645f1344db9..3e24aceb624e 100644
--- a/net-misc/gsutil/gsutil-4.41.ebuild
+++ b/net-misc/gsutil/gsutil-4.41.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-misc/gsutil/gsutil-4.45.ebuild b/net-misc/gsutil/gsutil-4.45.ebuild
index c645f1344db9..3e24aceb624e 100644
--- a/net-misc/gsutil/gsutil-4.45.ebuild
+++ b/net-misc/gsutil/gsutil-4.45.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 65628183847d..ee4bc6417ae5 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -2,5 +2,5 @@ AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe
 AUX httpie-1.0.3-test_binary.patch 782 BLAKE2B 1e7e63fe889e2b5ebcc814d681652b718d49c2bdf09d90e70c10cf2f7f6cb88ea70509a98a7e56d6b84ecfb84b6b8e5158e73c8d322aa161c8de79e6ac0332fe SHA512 ed917989c3f04aa213739563a6ccd34da413798787cff6a9af07ea058013c6a96c06dbf1e36daefef45faf571983286d3faab869b7918b29239278b54e5570b8
 AUX httpie-1.0.3-test_stream.patch 722 BLAKE2B 8ae3ff08311178f40d6e4156fc0fdab443e1f2b76a73f8f47bdffc2b3f62e506b9a60e856ddd358da36e9f45ccfe056ea18906f627c40e20313bd75949711f04 SHA512 1a5b9a010cba066b7fb33e7222c343271e7660f460e2cf23bfcfbb1ad3e6d1472e4dc9ee4679d9c893c40ab1e8dc7a652e2209167cd51f6f5489eac70be03d99
 DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7
-EBUILD httpie-1.0.3.ebuild 1294 BLAKE2B 8d9577f2b9d2a940f55bfbcbfd672084d489fb9fea641da9b0a588e90aa8117bc5f11e3f4fbf51cd521a078069b06a2a9ea68c6909c1ce81a79c59bbca6b0ef7 SHA512 5877d5884dff32f404cf787ef5f1a11be22ec55e62d5ab64b25f5d94d1c265bd351af6a7e82bee295a7134ec0024d893aea868643ea3e2e8567bae5c901f2ef4
+EBUILD httpie-1.0.3.ebuild 1290 BLAKE2B 4c7fdd918c3fff58b5120efc5c05a19e323ffd9640f574ae5fc4c6cc12b35546f469d084a526e70c2bd2e20e485b22329c47b2d6ff0632751148c04e98825bd2 SHA512 4e29155bdaceaf75c573a5ca3a802d8a21a5786aae53b682c73220c1acfe19ffb715f450816a0d6f2b177e95f8d351c1194dd2ac8fc9bc14c1f434123880b153
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild
index 526bb639658f..d65556fc1b0b 100644
--- a/net-misc/httpie/httpie-1.0.3.ebuild
+++ b/net-misc/httpie/httpie-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit bash-completion-r1 distutils-r1
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 42b279f71672..2878171934ef 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -5,9 +5,9 @@ AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b06
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
 DIST linuxx64-19.10.0.15.tar.gz 102164402 BLAKE2B d432c0addc7dc01f371dbede8125d134c82b985b359afa9d91c23b4916976f19513e6b72bac969526879ff6f3de56ab1898f729123274af93273526138553653 SHA512 0244e09bbb4b7f1c53170127215a94b87754ab633d75100e8af4777d3013344c3a06f6ec3080e9c77bd5bf54b117ac520ff04aa349e9b291cb041b06903da71b
-DIST linuxx64-19.8.0.20.tar.gz 101850343 BLAKE2B 275896b781addbc4b83e2ce54b46136a2595b65eb8adf9675b2a2695aea5acd36d99ee01b0171498a6f724c5d1878ec4a7741f3fae27a08b93d1bb6a79a9c49a SHA512 141f2c3a0fef7be341568029228a4c32ed5d578014a513fb3ca1fd6213b42b613a07b0c5dcf350712a0d7190006b9443ed3d7279707a29d0c00ddc4108b7b090
+DIST linuxx64-19.12.0.19.tar.gz 101477021 BLAKE2B 770df46d1d810443b3c7cdcb0820a15fed66dab7794bc859b9e18a162ea8579f0459e1665f276a862c0b0f69ff3b5f44bd620b25244e52ba5ce58bbe9c9e493c SHA512 47d37f9d1e18d8065346f918a86286261567149ad9d12266aa07248b66124c3698aa520c09639c44face14d087e9dcae85da8706894fca5d7dd641fca322a18f
 DIST linuxx86-19.10.0.15.tar.gz 109350883 BLAKE2B e7f7b98e04db9259b02177e18d5f2bf62975a50635e745b99d9c860370b468e63b30f01b85090b0749f962916c3606f4b53b66e1b6a271f6b33ba6a5d39c8ad7 SHA512 0d9e1692855d4122cef478a04059b0a7261165a50cebbf1524a426b841f65b6e26e01aa98865f7ba35ba7c8386eaf7d7301e5fc03019f9034c91971a53459c1d
-DIST linuxx86-19.8.0.20.tar.gz 108044897 BLAKE2B a76d8c507bdc662f62c7874e19bbbbbe5a59f0f146b7226f3f989ff9626db3def036b7b218c47a71f75c5ec873cd81a785d79a69291c49d3db3ca630950379b2 SHA512 0c88f511b289caac27d1b8a83e8a1c49a9a9f431b880f53172229a58df85052d67890bbb1b5e3f8272c9c7f6d3dd9e588aff481ac727293cec6148a18facb061
-EBUILD icaclient-19.10.0.15.ebuild 4593 BLAKE2B 68bc7cccdf05285b57c5c319aa289057f9e4a06b2bef35f39ac5f25388e04f476d5b5f7cf6b031097feb4c28957bf47db45f562bdb09f7053a388c8cad156911 SHA512 dc8b0f1557dd842415bf9c30eb738b9e6019e9cfb32b3066eeadf931cab60e1f2c35eaeb88e3f7d661557d7ace5f2598953e47b4deed8f6144b12f673e24072d
-EBUILD icaclient-19.8.0.20.ebuild 4591 BLAKE2B 76e06a63a082b3011e2bd3fcf2bb67d0846de132285e7297c060e50c05b218016e0d43545a30196d1e09a951f4bbc2747857d482cb900896c6b0a9d87f9f090b SHA512 3af23277d88290f4df02d500e979b86c7cca5a9e03f7c4983b928dd43ada3dfb34628ac28b9b445bfd09a1bf1c28be8b4b23359722eee9aaa91aaaa70e51c466
+DIST linuxx86-19.12.0.19.tar.gz 105565838 BLAKE2B 44623c1f59a7ef8319676303a73a3045925cbe07b1b22b09bc2ef1b35cfbfff508fcce291d949ed66f27127fb0289f7c2efcff0be82cd2d30f578eb6c06d4ce5 SHA512 f53321dae6b7e144af4b4a58cdb17a72da41566f3f499ce9ccb4f29581b6640021c8529d884f9384f4e820c6458605156b54fb789fecff25c6e18d1435dd9e90
+EBUILD icaclient-19.10.0.15.ebuild 4591 BLAKE2B 76e06a63a082b3011e2bd3fcf2bb67d0846de132285e7297c060e50c05b218016e0d43545a30196d1e09a951f4bbc2747857d482cb900896c6b0a9d87f9f090b SHA512 3af23277d88290f4df02d500e979b86c7cca5a9e03f7c4983b928dd43ada3dfb34628ac28b9b445bfd09a1bf1c28be8b4b23359722eee9aaa91aaaa70e51c466
+EBUILD icaclient-19.12.0.19.ebuild 4593 BLAKE2B 68bc7cccdf05285b57c5c319aa289057f9e4a06b2bef35f39ac5f25388e04f476d5b5f7cf6b031097feb4c28957bf47db45f562bdb09f7053a388c8cad156911 SHA512 dc8b0f1557dd842415bf9c30eb738b9e6019e9cfb32b3066eeadf931cab60e1f2c35eaeb88e3f7d661557d7ace5f2598953e47b4deed8f6144b12f673e24072d
 MISC metadata.xml 602 BLAKE2B d0a0f2a13b43053f748f4250ff9fd0f7aee5d53501d773081e646097e40b5a60bb49c4517ec4689272c2e14bfd51acff76c8b4c8575533697f8f069854a4d5eb SHA512 281c87fd74b63941c4ae76772c7020b0c70adfcde3e87be13cb9b0994aa4794df2c2904e623518812d1da8ea602b45c95db083ea7d239e7f0e7c9c92487bd68c
diff --git a/net-misc/icaclient/icaclient-19.10.0.15.ebuild b/net-misc/icaclient/icaclient-19.10.0.15.ebuild
index 48377166995b..45ae009f1b9e 100644
--- a/net-misc/icaclient/icaclient-19.10.0.15.ebuild
+++ b/net-misc/icaclient/icaclient-19.10.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-19.8.0.20.ebuild b/net-misc/icaclient/icaclient-19.12.0.19.ebuild
index 45ae009f1b9e..48377166995b 100644
--- a/net-misc/icaclient/icaclient-19.8.0.20.ebuild
+++ b/net-misc/icaclient/icaclient-19.12.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index 57cc5c5b532e..382e668921e7 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1,3 +1,3 @@
 DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d
-EBUILD ipcalc-0.41.ebuild 520 BLAKE2B d8326de375a29568f825f0d618d714d111c79e41ea18999e40380a77c6723c85d00d66d4dcdb5898abf6bba469fd97f3a7c0edfefae9c4d0aba2acf75017a826 SHA512 be40e578479d084cc17d18489f9fa2ecf368d6836a39e386bf8faa4646edd70f8206d5f209a61e6be9417c4e8de0e89ca73b1bf397ef706e9768e62b5b97ede8
+EBUILD ipcalc-0.41.ebuild 532 BLAKE2B 3a26f6943959666a5083076d0b9db3dbead8614278f5f64e421b5b2fd08b202ae385593e09b908108018cf682d4a0de172c88d42d5fd10f325bb8974ca006b52 SHA512 5179b1b181b3d12b1c862318f368c7c0d9064f8eb317321a4d6b293b2a3be7a840444239c12e87b755765531df42cefdb2e50896b188ce2e9fb76435131a3468
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
index ac033fa639b8..3e005190cbbe 100644
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 DESCRIPTION="IP Calculator prints broadcast/network/etc for an IP address and netmask"
 LICENSE="GPL-2+"
 HOMEPAGE="http://jodies.de/ipcalc"
-SRC_URI="${HOMEPAGE}-archive/${P}.tar.gz"
+SRC_URI="http://jodies.de/ipcalc-archive/${P}.tar.gz"
 
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 8d85dff3c7e9..486601716028 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -10,7 +10,7 @@ DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef6
 EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b86ed3a6cdb5c54751d566c1ebc35898a5781db563b0dbb499205b6b968007dce69ccbfa0ad5f4618898dc0a6 SHA512 7f7bfc1135d70d799ce97276967111e132a1f7b80ecc786b060dc5fad12fe0b1cc838d4919b1ced3fab3ac96ac0eb6d5a417b8381554217005eb6da49f3f8b3b
 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28
-EBUILD iperf-3.6.ebuild 986 BLAKE2B d90dd578202835aa5ea55172cbdcafb66216c2a311e12b46fe5a317e349bf450bd7778945463b4a555d4eacffc33fc01d7ddd1c56166db86e541383ccb1c5af8 SHA512 a48d7391d86b75e63335f348daaaecbed885177087e46172c79d524e1e55e508fd51f153055b21f07f230e906d67f18b7b3d0618ef8cab52832e71cc48962ea1
-EBUILD iperf-3.7.ebuild 950 BLAKE2B 1149db0005f2b3be9468a6ef4bb86a151223f0685ed846c8fae0af08c7f0156bd6cde8ad16330213231f3881a02d0bbf507770dd7655ac9255dd6f927f5256d5 SHA512 09017cf529a8a79343d24b3a1a42f144a50e8badeccb0a5b36804513d8e0eff3ce0df3dd69793f85acfcc2778f28e5f9db6fc8fb22c4b1a4f928acd3b9e66a65
-EBUILD iperf-3.99999.99999.ebuild 803 BLAKE2B 586514d1fb209fccbd940bca4a5e37c0c4e12778f6caf493e959a2acc7bf86c979f4f0b2f47b963446208aa681b900fb5d044a4ff2c827f21a796b79c7b1e052 SHA512 96794cbc42db4da3b6e8bcc8e700f9809f0992f399d1efcbdba304090943321815b83180360eb2286877ce769873a28b51c13025ad4c129a590f3eedea054826
+EBUILD iperf-3.6.ebuild 1006 BLAKE2B 1f44e5856fe15027bfb966c5b22e961c3b0290d9745c40cfedd7389b006d67a543318050ad515c70591c328604a928c1ac1bb3111a9d0b9f8b720d336f7661c1 SHA512 0d98e529e62143c82cae68feb2595bf2192dbf4456851c17a7f8c1cc2ae40f2c7f528bc7c95fc56d27b67eb7a4aa37e798d270beade6fb3800c248d23d99e4a4
+EBUILD iperf-3.7.ebuild 970 BLAKE2B c6609695e2a17234139141840627dd35922e7a1689aa5ec6d798bf450651af4bd8d1cd21abeeaf5fee76439f1509d7d3b0f7d6581dda9a6a0d6fdaab6daa4d7b SHA512 36f41ad3014644cd1f208fb1bfae6547c9f334a7c7495857c6c1443235837069da814985a979e748f12672fb5331dc506b4b2296ca90272a8754cee71461db9b
+EBUILD iperf-3.99999.99999.ebuild 823 BLAKE2B 4e56f70792a7f34ab84c23370d8da8ddb9c32abd27ee0352ebd48f30106f1e63d469181218bef96ad4403cdf1b50ed3f1703470a84ddcef3402cc95b12600090 SHA512 d07242508a0f58c9eb25396e81e9b5559da20ee5a377a78597bc868ce4e04b8e5c61a4777b8d45239e552f84d3bb804e51800f30b6ee00840c6fd71f5e15d302
 MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
index 6f6abd072e8b..20d890f1ac63 100644
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ b/net-misc/iperf/iperf-3.6.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild
index 4f27f26edb15..2412a7712334 100644
--- a/net-misc/iperf/iperf-3.7.ebuild
+++ b/net-misc/iperf/iperf-3.7.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index 5dc516b75b6c..6e651505943b 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -6,7 +6,7 @@ inherit autotools eutils git-r3
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/esnet/iperf/"
 
 LICENSE="BSD"
 SLOT="3"
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 584fd0505a88..1aa7772e85c5 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,5 +1,9 @@
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
+DIST ipv6calc-2.1.1.tar.gz 1453854 BLAKE2B c95f66c2f99cb4953a0c9a8416e294a08d4907e0c5df53616fd0d26c31070ca4727fcb6ebe3d9d84b147d8f24bc69a5c789564ef8e0f5e2fedb1af31a664ed85 SHA512 99dfc87c33c48722d75c98d7a4417b68b23da3d691629ebec65a18992d82a09fd01e55f829f4db4440e0becb746907669cb0bcab4a9ecb477bdcf8ecab675dac
+DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2f745213059ed2b0f36d7a9049a7a659d0419e6f684661247c7714d3e9886fe0a6782f5dd35895c46f2583310dcd SHA512 6e9acde56e245ffae0903305659881eb763524336da285d5048b655728c7d7b031ae7b4190f01f663e3d7134defbb8987c8f47ddd75bf8c8368ec1b918ee42e3
 EBUILD ipv6calc-1.0.0.ebuild 1545 BLAKE2B 20604959eec3564329c9deb173fd37d8a624ed474d5aec35efcf76dc9cb3f191eb7e70379ea942981b5cb9813bd19563cf8bd04cd307ef5e16d30bc535907f0a SHA512 4d0b6115980f57558cc2b44db4d71cdb97289e61fe80e19b7bbab07e302177af4c63b43a82c002beb41131614592595ee23b7d9ab13eb984485a8cf1e67d0f27
-EBUILD ipv6calc-2.1.0.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
+EBUILD ipv6calc-2.1.0.ebuild 1584 BLAKE2B ae3bb846df423a60cbae3b1eeecb3cad8457ae7deb438f66003b3d6b60f7ba2619fbf92b1e0e316e2467069bebfa79a01eff90e49cc0da851b5e8ad21a0e60b9 SHA512 0597cd98ff378014e90500c15a99feac6a1318d70c37211c2303f854e5b39a5994f9c308586f060da60adf18363dea7f2c29ae108bbb8a9b2a8f9f4edcb4f1e9
+EBUILD ipv6calc-2.1.1.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
+EBUILD ipv6calc-2.2.0.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
index 65630c1080ec..ca82dae2935e 100644
--- a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild
new file mode 100644
index 000000000000..65630c1080ec
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-dbip2 \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	emake distclean
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
new file mode 100644
index 000000000000..65630c1080ec
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-dbip2 \
+		--disable-external \
+		--disable-ip2location \
+		${myconf}
+}
+
+src_compile() {
+	emake distclean
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/irrtree/Manifest b/net-misc/irrtree/Manifest
deleted file mode 100644
index 71bdc9573d48..000000000000
--- a/net-misc/irrtree/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX irrtree-1.2.1-leniency-deps.patch 397 BLAKE2B 3fa9214970d783cbeb860e84196df71cd025a7bfdb4df0d6cec5667cf9099ee6e765436250facc0f3e44e1bdebf834ceaa30bc4584795953acb3431d3d8f92be SHA512 e6550c004ba66245c2c0c73bc4e4b04323d347cd2eaac27411dc992a7ae13ef7cb12c1c3de82a9834f2a4bfd1ed49752e2cf909887769d06a1fbb6934f561c6a
-AUX irrtree-1.2.1-queue-capitalisation.patch 395 BLAKE2B 8b04335ed0a76136ccaf3e56b788319b01aa89916f81ae39b85187a711e03635f960eb17d4e3ef27974565925f5ff21e06e1ea59a5dfa12f3d16b7f6b17f43ff SHA512 6d1a790c374d44f27bd4941b154826bea6837e0bd03407a3612a4b2f6e26248599b62f10b4054069d80c5b3bed97715c29f878ee1849b86970814d2648e01482
-DIST irrtree-1.2.1.tar.gz 5554 BLAKE2B fa5482f461d2eb4a93b7daa4851db11368ee39083bc312eb9e72836a2f001223db796e5a2947e3377d610496adda63d02f2cfedb65520570b4ca0328a5532af5 SHA512 c22f3ca606cbbda66a466e3c0518c8bb61d32fe3d376005b351de1f36a245cd3a28d89ba1ef8102e6dc2d06d679e260a46c8d056554f62fc2eb0ca21a23ab981
-EBUILD irrtree-1.2.1.ebuild 551 BLAKE2B fa24fdc722b2d1293c3819b1ff93d7cdc9559d0f2ca873abcb56cb1f0df8424ccdf72e36b48ca04c8187856477bb245b2e5acdda3cfd19a940897d9f32e8a5fc SHA512 364fed348010705e7a1606754050a0e4789d78a5cb6f7df2718c808717ed61d8741a9c8b444fdc7440f779a0636384f0e567c96ffb8258a0276317bf7505a351
-MISC metadata.xml 331 BLAKE2B e0038f66237900b0ac3c664b7ea1b5fb69789d64721fe57cbc86119c9d6a09954e69e5032719ee3aed04821b13af51f07a6d9ccd298a716de5966e3aa462e1db SHA512 25845f8cc4afd970c4c0a6aec55e1c3e3001c6d03ecf6803dd33f2a15932e0bfca20fd213d2b1c0edf44150cdf0fd0edf969cb2696e44cc556b0c724d5a84090
diff --git a/net-misc/irrtree/files/irrtree-1.2.1-leniency-deps.patch b/net-misc/irrtree/files/irrtree-1.2.1-leniency-deps.patch
deleted file mode 100644
index 2997d2af2c70..000000000000
--- a/net-misc/irrtree/files/irrtree-1.2.1-leniency-deps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr irrtree-1.2.1.ORIG/setup.py irrtree-1.2.1/setup.py
---- irrtree-1.2.1.ORIG/setup.py	2019-02-01 15:42:43.837122511 +0000
-+++ irrtree-1.2.1/setup.py	2019-02-01 15:42:58.682123129 +0000
-@@ -46,7 +46,7 @@
-     print("  git push --tags")
-     sys.exit()
- 
--reqs = ['asciitree==0.3.3', 'progressbar2==3.34.3']
-+reqs = ['asciitree>=0.3.3', 'progressbar2>=3.34.3']
- 
- setup(
-     name='irrtree',
diff --git a/net-misc/irrtree/files/irrtree-1.2.1-queue-capitalisation.patch b/net-misc/irrtree/files/irrtree-1.2.1-queue-capitalisation.patch
deleted file mode 100644
index 1196efa760f3..000000000000
--- a/net-misc/irrtree/files/irrtree-1.2.1-queue-capitalisation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr irrtree-1.2.1.ORIG/irrtree/cli.py irrtree-1.2.1/irrtree/cli.py
---- irrtree-1.2.1.ORIG/irrtree/cli.py	2019-02-01 15:49:05.583138394 +0000
-+++ irrtree-1.2.1/irrtree/cli.py	2019-02-01 15:49:18.405138927 +0000
-@@ -26,7 +26,7 @@
- # POSSIBILITY OF SUCH DAMAGE.
- 
- from collections import OrderedDict as OD
--from queue import Queue
-+from Queue import Queue
- 
- import asciitree
- import getopt
diff --git a/net-misc/irrtree/irrtree-1.2.1.ebuild b/net-misc/irrtree/irrtree-1.2.1.ebuild
deleted file mode 100644
index 998439317b24..000000000000
--- a/net-misc/irrtree/irrtree-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PATCHES="${FILESDIR}/${P}-leniency-deps.patch
-	${FILESDIR}/${P}-queue-capitalisation.patch"
-
-inherit distutils-r1
-
-DEPEND="dev-python/asciitree
-	dev-python/progressbar2"
-RDEPEND="${DEPEND}"
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/job/irrtree"
-SRC_URI="https://github.com/job/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/net-misc/irrtree/metadata.xml b/net-misc/irrtree/metadata.xml
deleted file mode 100644
index 723a74591c68..000000000000
--- a/net-misc/irrtree/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">job/irrtree</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
deleted file mode 100644
index a92d8d0d4a8d..000000000000
--- a/net-misc/istioctl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST istioctl-1.1.17.tar.gz 20765634 BLAKE2B e5192176312cbbd8b8f0ae46026909539df6c4784376a9e997b98d8147e7e9d4435ba97cbcb00880c99dc0ab2cd3ebbd4f385354c086f8a5fe71db57a8243802 SHA512 8d2057fbcb636f1fabc24a2f4c29b5426a9b68b0870a46ac9b5db6ea1f39336e5c1c7b13f040b346edbc35d1f359aacda1efd35b5417bd2ed90e693009cdda15
-EBUILD istioctl-1.1.17.ebuild 848 BLAKE2B 8ce6c940d9683ff2f74bd8a141ba9b862d029d27dd33d80a29aff9049dddf2ee182a3169c137cd773bd99994faa4006ca019633fca22389e4afe668b33c5bb33 SHA512 c8f03acca7628385c120294bf118537e0b24e129e73fed27328b1ed3d884c735d0e1b4b9a90810e097bc2c25a03aebfb6b7274d81165f515f26699ac5d996ae6
-MISC metadata.xml 244 BLAKE2B 035fc01ea1319b6e276f4ed17501a22a91eece9091d776d034796e4368107ba196680cc9151de0e0cf545655630246fb93a5e43e301a8dca55d3607d80483a0f SHA512 bc817b979b26d8cb3f6202cd8207baaf0ea0776594471f97e2eacda02284b37c6bca5f84eba341b7a5b7155bb4bc5339480f38a3be259a0c7a6b7c004d1b2884
diff --git a/net-misc/istioctl/istioctl-1.1.17.ebuild b/net-misc/istioctl/istioctl-1.1.17.ebuild
deleted file mode 100644
index ce116f5676db..000000000000
--- a/net-misc/istioctl/istioctl-1.1.17.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-GIT_COMMIT="149c2fc"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Istio configuration command line utility"
-EGO_PN="istio.io/istio"
-HOMEPAGE="https://github.com/istio/istio"
-MY_PV=${PV/_/-}
-SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
-		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
-		istio.io/istio/pkg/version.buildStatus=Clean" \
-	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
-	popd || die
-}
-
-src_install() {
-	dobin out/linux_amd64/release/${PN}
-	pushd "src/${EGO_PN}" || die
-	dodoc README.md
-}
diff --git a/net-misc/istioctl/metadata.xml b/net-misc/istioctl/metadata.xml
deleted file mode 100644
index d05357ae0503..000000000000
--- a/net-misc/istioctl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->	
-	<upstream>
-		<remote-id type="github">istio/istio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 869e38d99cd7..2ad72dd5d711 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.7.1.tar.gz 7203950 BLAKE2B 40684401e39a5e95dfa1b6d899fe8c6a9e3418a65d3314215b287bb9898324a52b296292c7bdd11cfdb4d1d2f7f7c15c26a3f7999269672272486240f2d7cc28 SHA512 7c8ff3fb0bb53fcccf406660ad50593afa5f03328889c03791f6ac28dd41fbbec2094071d786f03b5cac96f887b48c5cca5c1d10a8922a1027279726458522d1
 DIST kea-1.7.2.tar.gz 7229506 BLAKE2B fd84bd69e4fd147b91af80bb9094476bda3a3de0253c6f1880adde33458168f2dc24b6b95ed7b4f0d65fe69b2304bfebe8359e1bd61c28c9ba070e03531ee531 SHA512 f84bed2e1dacd172c7aed8e4d6c11ec5e79f37ad2c7991963fc9c4a1761668f9f0e105ba5c4deed06264ab2ec13b1b5787350d823de12fd3782223192e3653f2
-EBUILD kea-1.7.1.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
+DIST kea-1.7.3.tar.gz 7284882 BLAKE2B 9023d3f2df7a81d817b83cec9ea52d75e268d95e5337befa973cf8630b620f0454e8cf6fdfa40f02c6cc3fabf0671e2f18e974ff2412b757fad2081015fa1e21 SHA512 17720bd5f119e5fe1cea9ab3642630757fe645c662ab8efb1af0bd301786ccb950c7a7c5b147ad54a7a5aff6471fa84c6a11bf031030180e3080be02894d4812
 EBUILD kea-1.7.2.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
+EBUILD kea-1.7.3.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
 EBUILD kea-9999.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.7.1.ebuild b/net-misc/kea/kea-1.7.3.ebuild
index c915fee4402e..c915fee4402e 100644
--- a/net-misc/kea/kea-1.7.1.ebuild
+++ b/net-misc/kea/kea-1.7.3.ebuild
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index 414e84d17ee3..4e7a232bb43c 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,6 +1,8 @@
 DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
 DIST libteam-1.29.tar.gz 175970 BLAKE2B 8fa4192fc90b3a7ebe7ba9330191ad81e9c27dbec8e6cb657cf287cc66e4d3cc072ff032ea48311368401d7ba89b31015a9ca0c285a262336d6babfcb6457833 SHA512 adcf3706abd7fd2641388606dc2f39584607ec1f455bc52409c3905961cea446baecc5af80b6605ebb7167aef6f539b99f641cb39d97d396f32cea2aeb676561
+DIST libteam-1.30.tar.gz 175985 BLAKE2B 10ad03167c627ab7a51c5a8bcaa7fa95233c10a8df72c602e6a053bf48560653e053a5c161d61cba5e2c8860c80e17e04e953ae0fb483d00fc70d8b56630e93c SHA512 c037fb20b31fe018f508ccd733037267bb628b569f5689f5748e3daa467239d4d5ffe00ca389022d4dddaefed11828204b2887fdccf1a76327b56ec7fa0a0be5
 EBUILD libteam-1.22.ebuild 1280 BLAKE2B dcf5b6dac0742ce5f77534a2f0fc4f135efdc759616491fb82532d00c260f6beeb6476a27e4e15d91e73393b71a800e9f958d76d104494d70dde17d565ba5703 SHA512 5cce151ef7ddcbdc97f85963e633147bfac5cfe1f37cc580fb329a11b5d1179ca76833eadbc29ce9b70ae5b7ac97af0065a0e3e23056b91c90f570e171c9efe6
 EBUILD libteam-1.29.ebuild 1373 BLAKE2B 4b4ef0e895ef437b1a4ec01e6bff9964f9f3ec96d98345cd9b5b2a9c9f389c793d2005c2932be7fce0414f9cc0418a03cbb1b4660d3e37834496a2e26fb664f5 SHA512 060d16f4e5120b6325aee0eafda90d5b48d2af6bb3d1ec9887f570e4b748eea1d074750646fe6785850466318df0bffcfc9df83a9ac7395128606c1dac2d2da9
+EBUILD libteam-1.30.ebuild 1373 BLAKE2B c083daa904b401950a8fff15670e08be65ffe08acf2cdd60c0a8c8e7f4873e3dd18ea8b5eb6dd8475c3cac7a4fa4b56de03d7a2cd27b9b3cbb871335cf49a2b4 SHA512 8b90a7e6631e8e0e098086658087af55eb17aa941c6b2d0290f08948056f75e2c57f8db15833c7a98a324f40e41c6409fd84c6966b18798f08a3d0635bf6f191
 EBUILD libteam-9999.ebuild 1358 BLAKE2B 82baa62b2b443b492034359f4fa469d0fc7ed7f6cfa75d45c13281d6ec6be0222c4119a3f6c23024a4f52dbb6bea1b8b8342c4edf545592bb7406d8e23c03714 SHA512 beb5dafa39a3671e3bb91d45f524e4a25c1fe0e0a0c4999701f5fc23dbb7c8c51fcaabc49f4bf172b309d7e23ecbefe084113d73c04eba11e58813de3529e5aa
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.30.ebuild b/net-misc/libteam/libteam-1.30.ebuild
new file mode 100644
index 000000000000..cf1260d2fc5b
--- /dev/null
+++ b/net-misc/libteam/libteam-1.30.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library and tools set for controlling team network device"
+HOMEPAGE="http://libteam.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="dbus debug examples static-libs +syslog zmq"
+
+DEPEND=">=dev-libs/jansson-2.4
+	dev-libs/libdaemon
+	>=dev-libs/libnl-3.2.19[utils]
+	dbus? ( sys-apps/dbus )
+	zmq? ( >=net-libs/zeromq-3.2.0 )
+	"
+
+RDEPEND="${DEPEND}
+	syslog? ( virtual/logger )"
+
+CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
+ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
+Only >=3.3.0 kernel version support in team mode"
+
+DOCS=( README )
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable syslog logging) \
+		$(use_enable dbus) \
+		$(use_enable zmq)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dbus-1/system.d
+	doins teamd/dbus/teamd.conf
+
+	if use examples; then
+		docinto examples
+		dodoc teamd/example_configs/*
+	fi
+}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 13d5d558ef2a..938848da4a01 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -3,5 +3,5 @@ AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.2.1-r1.ebuild 2716 BLAKE2B 5d970b7e2e159534157c55bb0aac2b6167aff75e5d628f88805b667608a7e0198611b1bf226ec5d4350cd96a4c1593a5adfb1a4477bbd6c811f11fcef20e4f88 SHA512 ff8d42e6a9b89f5df2f048e6be02117e42cdbe134c705c1ef26d3a6b31ad5da4d57090a7504828a1f06b6c96730bcd7b8e83bfb6b7bf0d72358c9dc8c5d2ae49
+EBUILD minidlna-1.2.1-r1.ebuild 2745 BLAKE2B 6b9f3f17ccad4f1d0ab932dfcaa3dc49967491bec297a5bba40c0b6b4a9dd10e0c3b2c29e9e7737116499b78054a80bad4b64ed16f61857d38fd89133d9b0794 SHA512 57b80d442e91e9c56cb1238c54c4a421b6e5dd84298186266a0aad0bfdcdbcbe5261922810ca66a4fae57859218f4d2bfadf6b0c6e58fcc7187604c4563257a5
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
index 0f41e2746724..53e65e1fb748 100644
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,8 @@ inherit autotools eutils linux-info systemd tmpfiles toolchain-funcs user
 
 DESCRIPTION="DLNA/UPnP-AV compliant media server"
 HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="mirror://sourceforge/minidlna/${PV}/${P}.tar.gz
+SRC_URI="
+	https://downloads.sourceforge.net/project/minidlna/${PN}/${PV}/${P}.tar.gz
 	https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz"
 
 LICENSE="BSD GPL-2"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index a126a436af9e..68d3dcc4914b 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,9 +1,5 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26
-DIST miniupnpd-2.1.20190924.tar.gz 241008 BLAKE2B 392006e71ede0d18dc1dbfd13c46e591f6675fcb02828461f0afc79b4019f953f62ab95669e92cee4724ff502585420c563d555a7948b0f9d25d755efe6bdb2c SHA512 719a3ac741327691170d7e933b170dcc1399da1958d9373327b96ab5d975290d2bfa0f68d96fbb2ac4b3fb9808b50385291705cd393252263f403d43298c4031
 DIST miniupnpd-2.1.20191006.tar.gz 243255 BLAKE2B 38654cfc0238cdd413600216b01465cbecda69589249df5b6500db7e0719053dae351ab8c61d763a7586924f68b6d634266a1020084f30261442ac62fbd17a5e SHA512 5de2dc5ffb6df7b06bcb6ab8d8fbb34aa5a229a8310938e980b4caf6b957ceab104c455cebb57d7083736fde2db9569fcdf98783a36c915d362f7ff2987e3599
-EBUILD miniupnpd-2.1.20190902.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
-EBUILD miniupnpd-2.1.20190924.ebuild 2138 BLAKE2B ad0170d29b3c1e3a1e4399a362b86476a91e3b9c7aa6e803b2943ff27992baf9ec10092e60c308f346de69cb6bc24ce9614b3f8e80cf3fa0bbd7e1a339718c45 SHA512 9976ba11b7fcdedb7598a7b0df7cf71cf8e917c7dd42b1818c168a182c0ec9c821740baaa012d1218046cc15a874e91de8d669d13a0b4ea26dcc8f067ef189f7
 EBUILD miniupnpd-2.1.20191006.ebuild 1973 BLAKE2B 06623d2fd8d2b2e31c1c9515ffa34aa5f083662f78c3b4478ae7003768e4a272419a9654bdc4e201bb2871bb5c11dc16ca52144687786c2593c690afd40d2a7d SHA512 b231ba28a2dbbb676b76cc07706167d194f5d628f228d5585dd3dfd7effd1e79a2526d9f53912b3c32ee0e3ba1ce32f45d15d636afee3435ed6c59845c539cda
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild
deleted file mode 100644
index 07c804f35640..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190902.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild
deleted file mode 100644
index 8878d99503e2..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190924.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-	# meh, we have two Makefiles but genconfig.sh guesses anyway...
-	sed -e "s@\[ -x \"\$(command -v nft)\" \]@$(usex nftables true false)@" \
-		-i genconfig.sh || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index e9752960c073..426aa0f35085 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,5 +1,5 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.3.2.ebuild 1520 BLAKE2B 1f8046fbe505d2aae17c26db0a07145e64e9fdcc2e1629b60e7cf6254b24ff8ca94fbe0a3e457913a3f5e1ff5243f69ead99b32544eac5432dfeb439990ad408 SHA512 1b4d06097a904068c0718042d5eee38b95796d7b5f7cdee872fcb8292985338cda321978ae379ff840fecd4f5b378c3a2bc854089e8ee78ccd9c40ea64d3ba9a
+EBUILD mosh-1.3.2.ebuild 1507 BLAKE2B 9b980e5c1e36df32a914e9efee051509c4ea43bc6eb60b0f23c0f203473296144a971fedfb70b20f9982e1170dc70c7a05b904f6ea31ef55aa7d73667ad15eb1 SHA512 27012d2e4faaee8064be307f971f818c5926bf8c0714e503d779a5b8abb1ab551aa329f6b9e4e03f681d6664e0a124722ef24591c65cb79a2a6a3a242a8f01d4
 EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
-MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
+MISC metadata.xml 1046 BLAKE2B b82f683b0b6a236f78d9e46378e5bf14bfd1ff232045c9a56490e1d19a58767ba1f78647e57b60217aa3851059c4a96c4c8218fbd5387203ad34ee5f577e0f32 SHA512 a4d754df5abc7fec2838525e5fec6386086a4afbbd1132cb4360fcea8211f6bf1629a00b5ddc64faad8e89ccc9a8bc82a9467b6bbdedc6a7503447d84407589a
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 60cf94f05677..0e7c205b7c03 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
+		<email>amynka@gentoo.org</email>
+		<name>Amy Liffey</name>
 	</maintainer>
 	<use>
 		<flag name="client">Build network client</flag>
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index be9bd1d1b4b8..d6f21d498fdb 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools bash-completion-r1 eutils vcs-snapshot
+inherit autotools bash-completion-r1 eutils
 
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="https://mosh.org"
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 26a7b1aba7b5..aa4c37699d92 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -9,16 +9,18 @@ DIST netifrc-0.5.0.tar.bz2 78738 BLAKE2B b0627aaf0ee0526cfbb6af3c8cb82476ee910d1
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23
 DIST netifrc-0.6.1.tar.gz 79791 BLAKE2B e38236d189ce0e40eaa5ba7b94e2e74e444bbd185fbacf515c65ca1f0ff441525cdc44696e12ff33e4ae1f80f2766a91866cfef8f9b737d34e1c59290248f49b SHA512 798a882f87f153c31b415d77a06a2beca94a958ea982aca20bbc2cf6a7d800aedbd99a577734ea41d6a75807b13d640dd7fa5a51aa5a27055e9c552634ac7bdb
-EBUILD netifrc-0.2.2.ebuild 1730 BLAKE2B ee525a574b7536654de3c99d97717c3d0ff21b7715d50e5eafe83aa1ba8350078360abd7fc569463e24608d2e879c0165aba6e8cfc4ffdb9c5d9dc3105618d2c SHA512 bd320c13d605dca1852d37e9bf70aa684762e6a42eb9d4176d25b19505cb2a5c326ef54edcbe2e85077712e281004fa5da5530de91564e4163f5a3db61950bfe
-EBUILD netifrc-0.2.3.ebuild 1743 BLAKE2B 887ee1fcd866dcd72e7df80428712a69f157e49231eeff6d168a0118d67cc18d1ae769aa0dff88f88cb349731e821d25faf9f8c10cc419ea832cd2e2c38bae70 SHA512 0ceed4927632b18e6b5faca500a78def1311f68749c24289a7b74058b6a3dfb01dd10238ba6759229f70b1515a020dfdafed95f49ff24d4e729273818071cd80
-EBUILD netifrc-0.2.4.ebuild 1753 BLAKE2B 832e6160573e7e664e4b98324d39af9e7363025b7100f49798d1460de956fa903e7b4c334ea3cce216be574ada1fd2ed7149cad7817125e73004983e16907862 SHA512 6136ef60a45b3922c95bf7f958a077cee7aec45364fb3e70762ee30e660498aaf9d0b2cad3650893b94c1938595daa998acf5a339284e5cabfac631ad6de0983
-EBUILD netifrc-0.3.0.ebuild 2040 BLAKE2B 7dffcff1ea0e43292e0659319b3035b61d9fc4283c8504377e91ce311df8975c4e975e47d257456cb374c6bd7c5624e0fa4628db7cdbe6c51af8070b9eac3a90 SHA512 603edee153d53dd18b40e38586de7e0983e6f5c32cfc6de3fa4abc8912239eb868b4bf78f54206376c9bcc95963ee62d7c6495de22c8039615743de86fc9154f
-EBUILD netifrc-0.3.1.ebuild 2080 BLAKE2B 0958da234bf0ed3a35026e94566c801a21bae435e083c1a8f7e19564304a130f77a54f9016b6d19abd05a30aa55dc94a687f274c079f7ff1cdba55216d2d7b13 SHA512 27cd17b67776126d25714612522698ba5bc705f4e67ada47cf7857a3a01c763cc6f05f8d98f0d1299f5ae29ef6528c1e033806333ac829333e5ed50a6a0039ea
-EBUILD netifrc-0.4.0-r1.ebuild 2166 BLAKE2B cf72c392cafeb3a92ad76be093555fb402f4e5cd4f25249c6828875a472b2962cba758bc6e822e2c8541f07b1dae822af5b65254abe72a9177a7f7f855ea9336 SHA512 0d5bed01d7369eafc0dd162130957214616706c069b4db558810829ebaab3e47b2097354fe65ba47af308312d0c9fa50e2595e77d831ab5a7072ff7fe018d6d8
-EBUILD netifrc-0.4.0.ebuild 2080 BLAKE2B 0958da234bf0ed3a35026e94566c801a21bae435e083c1a8f7e19564304a130f77a54f9016b6d19abd05a30aa55dc94a687f274c079f7ff1cdba55216d2d7b13 SHA512 27cd17b67776126d25714612522698ba5bc705f4e67ada47cf7857a3a01c763cc6f05f8d98f0d1299f5ae29ef6528c1e033806333ac829333e5ed50a6a0039ea
-EBUILD netifrc-0.5.0.ebuild 2110 BLAKE2B c14733b06f4632cf6ffd8883a3ad3884f418024abf0cae4b4c9c667ee1950ed6358a76683342e016dd058201de064e71fcab92c15b3a102c83e13492ed4a0c06 SHA512 d766ac30519b28855f49c3ca1554c049583b3cff5a4e7b035cac0b9fcd4fadf8980ad35695433080ca32669d523ae89c7decd837de14486b19531b1d0703dfe2
-EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B 6ac90c206c86f13318db2b5b5a548097004b21c9d7e6fcda271d1d7b9eea471fe72cb80763f1cdaf8e67571e67684912b7fa8c1d2ca792c70a4fe1718645c817 SHA512 673503dd52000b2b3f3544f9ff8b348d8a92db38a81f74d45ba0bd269346fff18f2dfd13feb510e7b16c33eee0284e637264917c3aaefa976dcbd58134830ed3
-EBUILD netifrc-0.6.0.ebuild 2114 BLAKE2B 651778af20d126a183ee166c083370380f00ae8ad5a203b74814a0d27f89be8f81c760eaa794ae7df9ba1fb7dc031a78f0dd125f01e61ce261cb31614f9101cc SHA512 bc77e3869bf2ab2ca4d40efe55aea7ce680eb90516775785aa6824bc5ceb0be6f369d72bd2c9ab2665c0f8e2a206b658b6637ac1530b4e9dcbfb8db7c8532f7a
-EBUILD netifrc-0.6.1.ebuild 2111 BLAKE2B 65e46dcd4b963390f63f8e2566bc6159fa1d19f73583c80bdf7a9608fe5eb56e445d4e132dcdffd5cd90195c4adc9e2d79be5e1faff960c067fadf04758ffd11 SHA512 c16f80b00a9ea09f18f319f4daf0de87ecccc36ae6580a13d3c9ae3aeea493ed4050390c44170fbde74f143d4e9a3d6825a0b6ddeacb26d93f926172e8ceb572
-EBUILD netifrc-9999.ebuild 2110 BLAKE2B c14733b06f4632cf6ffd8883a3ad3884f418024abf0cae4b4c9c667ee1950ed6358a76683342e016dd058201de064e71fcab92c15b3a102c83e13492ed4a0c06 SHA512 d766ac30519b28855f49c3ca1554c049583b3cff5a4e7b035cac0b9fcd4fadf8980ad35695433080ca32669d523ae89c7decd837de14486b19531b1d0703dfe2
+DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
+EBUILD netifrc-0.2.2.ebuild 1727 BLAKE2B f96072b66056f08129014e1030331dbbbbc576f800ec0d0ec501edc7a4f0ed1bdad5fbb703f2b36ff15540dd23eef51509c7029b48a6f0e7cf47d0e8a071605f SHA512 ac3bd9f6832a2de8cc587bd481932647fbfe1fe509f7b432216e726c8e6920ec076192c92787329e07f57735fab8747c598e45671fc6f1890769d6bfb41b2af1
+EBUILD netifrc-0.2.3.ebuild 1740 BLAKE2B 9b13cd16968df313771ad16e1ae8d506bbe0814d882892742049b77940d11a7cdd54b0f8e227acfdc0c94797ac8148265fe61ee786db549edeaff8d628d7b623 SHA512 181f6a44fdb6e045f7edf84d910052c7a8b9c5457137cd876009eb74e72d09aa3b210439c615385eb9bc709b1f5e52aa5bf85d08c3f82ec37324dc345a0efce5
+EBUILD netifrc-0.2.4.ebuild 1750 BLAKE2B 518753a13579c8a81cc4f63756c1439b581f1e819c06a78ed62d05057404be20d5c2767c65031b3b87e997b8ea0146b7649f05b0d2c9e0fb46be148cc1f2f45d SHA512 3604201c0686ef814436476b7ee6f85d154af6c458d8563643e74808d8f40686bf35fc0171f1457afd6ca15670318d4ec4ebbc3c25d8d2c5d19e549e92c0cf80
+EBUILD netifrc-0.3.0.ebuild 2037 BLAKE2B 34b10741c38a3e825315fa26dfa612277f54e895a47ed29cb4ae724f2e280d9da5ab5bd360dcb85d4bec94a7255288067447a676bda4a5a5e49994bd005fd9ba SHA512 bf59226ccc042aee17251f8db873e98aa7ab50c36c0499c0de6866f7715ba4923c9763b9c552051470c281e9a8bbebc516c2dffb4fe2dffafead86b6aeeb4dcb
+EBUILD netifrc-0.3.1.ebuild 2077 BLAKE2B 53b8474b989d61b1a5f90f611ffa3990292ba62206a8e8a8653ef4e6c5d94eb82f90560752728919782a1b8a67bb83ba40363f971bfaae21b12b9a959e0f21cb SHA512 677453b6f75e3c84119344754e33eaeda0872595ed35b3c3605459d08f45a3d234003c5ff696825f93a0e4cf19570c229a43281358fb5076490aa883e406cfb2
+EBUILD netifrc-0.4.0-r1.ebuild 2163 BLAKE2B 186e48c75d12d56f6feffbfc4b8d7905b2b4e670a8afc1900d0cfeab696e8ebb474e691761f5da91d48fd56a017f77f753b9129de96ff62b599f1d86bfabdb13 SHA512 940eb2ae50c1a4f9294f6a208bd98f0265e01492f74587b6e63b331aec2029f2fb7ef699037f44f26a21f36472f7ee1198477a342e72f8007420e834b20bf576
+EBUILD netifrc-0.4.0.ebuild 2077 BLAKE2B 53b8474b989d61b1a5f90f611ffa3990292ba62206a8e8a8653ef4e6c5d94eb82f90560752728919782a1b8a67bb83ba40363f971bfaae21b12b9a959e0f21cb SHA512 677453b6f75e3c84119344754e33eaeda0872595ed35b3c3605459d08f45a3d234003c5ff696825f93a0e4cf19570c229a43281358fb5076490aa883e406cfb2
+EBUILD netifrc-0.5.0.ebuild 2107 BLAKE2B cb511b7877a11311c99e442cbfd0c9509ec61a24c1fef7bced478921fd4c0eca4fbca2dae2294b7010e888bd541199cbb68be5e343664dfe1202cf48e224413d SHA512 e34604ba3cc0a2e1202b87859c41203e02ede79414e5cf9ffea0e83e3df643c576a8d67a9ecfe6f4f09cbc3443391e2412996e2c3c2cfc1f80a69e7dcd8ddc40
+EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B 9d2a7f1851afc90297dbcc10a93732a4f11c87798f9edb3ee2391a3859fec75bf437a43cc0921b2f68147ab612bb7864129cbfd4ca529470b5b60cb80b0ccde7 SHA512 4a93a6af674d075ed070475aaa659456e6e050ca5d04b2a4f87318a0098256b1e5344435337ca1195ca71acb2cd770614dd44a67072fb54434fa3018311bb1d7
+EBUILD netifrc-0.6.0.ebuild 2114 BLAKE2B 80565920a07a1de3fe6112cae523a21c7354c5bd876e6fbe53d88660179c80994b9cb433cd2ca58d9deb747b1dcacb4909c025d7ba4a95e2b51a46c1815797bf SHA512 2401252fce0214771c6faa2f55fa102036737e52fc015e4cf6144159843ef33830bec346886233ab47152f86e50517e6c3bc0dda473f170abd8ff1fada6709da
+EBUILD netifrc-0.6.1.ebuild 2111 BLAKE2B a8f3d6ca6878a471b23ad17adba890be84dae7b3cd649a5aeb03a6c5e7d3b67a0078d95b683e87306911575993c76bd9d05cf2f8d654416b5485518a8d6cde65 SHA512 bedf3327eb612ac56f1235d36f3e4df76a5b5289cad01f1c55c825bf14494e692912eba61afd76f2751e5caf25742a58c0f00ef7a34568cd65a6e11363c551d4
+EBUILD netifrc-0.7.1.ebuild 2111 BLAKE2B a8f3d6ca6878a471b23ad17adba890be84dae7b3cd649a5aeb03a6c5e7d3b67a0078d95b683e87306911575993c76bd9d05cf2f8d654416b5485518a8d6cde65 SHA512 bedf3327eb612ac56f1235d36f3e4df76a5b5289cad01f1c55c825bf14494e692912eba61afd76f2751e5caf25742a58c0f00ef7a34568cd65a6e11363c551d4
+EBUILD netifrc-9999.ebuild 2111 BLAKE2B a8f3d6ca6878a471b23ad17adba890be84dae7b3cd649a5aeb03a6c5e7d3b67a0078d95b683e87306911575993c76bd9d05cf2f8d654416b5485518a8d6cde65 SHA512 bedf3327eb612ac56f1235d36f3e4df76a5b5289cad01f1c55c825bf14494e692912eba61afd76f2751e5caf25742a58c0f00ef7a34568cd65a6e11363c551d4
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild
index 98895e5ae186..bcc60b8da126 100644
--- a/net-misc/netifrc/netifrc-0.2.2.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild
index 1eb72875a929..b319f4a06c18 100644
--- a/net-misc/netifrc/netifrc-0.2.3.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild
index 1e3fc7439d98..a2917e7c6a10 100644
--- a/net-misc/netifrc/netifrc-0.2.4.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild
index 40dbf0278902..d592a9dd0ce7 100644
--- a/net-misc/netifrc/netifrc-0.3.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild
index eb0df4590b78..08120d913607 100644
--- a/net-misc/netifrc/netifrc-0.3.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
index 72cdb9285a54..3f8a4a55579a 100644
--- a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild
index eb0df4590b78..08120d913607 100644
--- a/net-misc/netifrc/netifrc-0.4.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild
index 939911b1c422..229ea9afb268 100644
--- a/net-misc/netifrc/netifrc-0.5.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
index 0f0e43e0d55b..97af480877b8 100644
--- a/net-misc/netifrc/netifrc-0.5.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild
index 5d03165380af..98c3339d853b 100644
--- a/net-misc/netifrc/netifrc-0.6.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.6.1.ebuild b/net-misc/netifrc/netifrc-0.6.1.ebuild
index b6901b9edd73..2718eb87d9b2 100644
--- a/net-misc/netifrc/netifrc-0.6.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netifrc/netifrc-0.7.1.ebuild b/net-misc/netifrc/netifrc-0.7.1.ebuild
new file mode 100644
index 000000000000..2718eb87d9b2
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.7.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="kernel_linux? ( virtual/pkgconfig )
+	!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+	# Install the service file
+	LIBEXECDIR=${EPREFIX}/lib/${PN}
+	UNIT_DIR="$(systemd_get_unitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z $REPLACING_VERSIONS ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index 939911b1c422..2718eb87d9b2 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,8 +13,8 @@ if [[ ${PV} == "9999" ]]; then
 	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
@@ -51,7 +51,7 @@ src_compile() {
 
 src_install() {
 	emake ${MAKE_ARGS} DESTDIR="${D}" install
-	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO ChangeLog
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
 
 	# Install the service file
 	LIBEXECDIR=${EPREFIX}/lib/${PN}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index b51857a2b257..d8a80ea82398 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,5 +4,5 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
-EBUILD networkmanager-1.18.4-r1.ebuild 11321 BLAKE2B 1f13dd1f8cbd83d3f04ded939edce5b12d150ee2f0265d246ff57a7d53c79e9dcbcf26e159984b7d798753a89bbcb795558083ae6575ae4c3f2625b5cdbc2167 SHA512 e0ff2b9682410bf64fad434f3cea3b1f7890b120e0e5ac4ca602c7240e2f7a31fef3ba9c198a5c3ab578af8dc982289196b0450889cc312afa17557f707a0007
+EBUILD networkmanager-1.18.4-r1.ebuild 11317 BLAKE2B d1708bae2519251123071b311d68703cc4df21912023506d277bf7c134e8cf28fc3dc325014fb8c0497ec85dbe53676b60e4dc230c68a9e3a9616fd2598d0c5f SHA512 091027b715f06d8f347f504c35e70de20f3a1042bb263dde8b2a7366e651f4c3a59bd64ae90ebd6498d5b442696e18bbe525ad130049d6076af773a0fefc7ddc
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
index 25d4a61e581c..ed2ea6102e3b 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 71c6313b1458..c07e8e7512df 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -2,7 +2,9 @@ AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c3
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
 DIST nextcloud-client-2.6.0.tar.gz 18789917 BLAKE2B db5c703ecf630a96c141c9c8a7b15894c5a679e1b36217f38a02cd55307fadb5ea19c13ab44371fbbcf0610ddafdd2fb0c1ef6119db04808b94a72dbfb27da9a SHA512 161733540de85c436e204b150fb91b527737fee213e569335248ce7c6e1446497aad5e3fa814b3f98a1ec0cdb94fad64ccc0807eb953a94170f9d40abb478545
 DIST nextcloud-client-2.6.1.tar.gz 18947504 BLAKE2B 940145f9f633ad35e740a92d44d0d7172f7c0883bf29951694dd540213dcfc64f9d480a1cd38b586842dad8c96d3c2948d6e8af6042005f0cd23d9b6d3eab7c6 SHA512 dbda59f5ef6f5f85d8344732be4a0b51e51fa9d0180d5b589f79ab6fe1bacf3a63879aee2f297bc76d6257dd830b38c695cf88f98b9e3f788acf9d6b2f11f619
+DIST nextcloud-client-2.6.2.tar.gz 18982053 BLAKE2B 53f4d13b42f50a272012909ed5c937b0a37543f11b8ef0119db670107ed10629d79cb2fcfbbe9148ff847f7ef9e38183f613ae3162206bf9e8f7424ae8280b72 SHA512 b56a7d6751381ffb546b0c8a4b9dbb7991f523ac2ff06dbc87ee36927a4326f57f520ea96a2116ead5d36db6b9900f552834ec9dff8ad5adf80e896829428199
 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
 EBUILD nextcloud-client-2.6.0.ebuild 1973 BLAKE2B ebe8613b3bae1c5f073404b358e70bc69552eeae1640c06f885af276d36a59b3cfbc182176672dd475e6bd927be12267029be04d791bd137e3bb483f3d2bdb02 SHA512 c10355ffa0c739f8db536b61fa22083af25c3499650ec6a60b42bc5410ec4d85bc1c12c224b8b443a2cc2b17174107fe5b8fb38d508a452f96fd0fd4622e81d3
 EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B 99b22e5e6ef99827c0846c2a1eaecae496376837d72c216358c530a8c03d3a8bdd607d26753d7c978018d01b285092a42bb77f1681f3fe31715d8acf92916f8b SHA512 d682fdc9c325c314b709d7de19499b3dda98bf3e75f519750e6269018b68e15c81fb7e26959effb9559a9d8a2530c386348cf03f97a58c77e159b816da23a751
+EBUILD nextcloud-client-2.6.2.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild
new file mode 100644
index 000000000000..0efd5f09b271
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch )
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index 7c821bd13a0e..2c0b780b2487 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,5 +1,4 @@
 AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
-EBUILD ntpclient-2018.244-r1.ebuild 824 BLAKE2B e4bbd69500500a9b91171159074a042cdb1da5a6b4cf5758de851237f9f98635ba7076fd983ee2a4f25aea013679904a683bb0b22efc67ee0c01b8410ad08da8 SHA512 7dcba14407c1f4136df05d611ccd4b1dfe3e337a449ef8801c9b11d99f15cab614a613167936cd901a0ad13c73850bd774d3d8fe5b6bbde661c6e8c02392d068
-EBUILD ntpclient-2018.244.ebuild 772 BLAKE2B 8e0972d3e6c71a5f9378c842eb5021b8c769922e2a4774157741fff1db1efcb7347fa7bab932ab8289e3ac045de95b0ddde7b8e0f5cce3b848716de8f510ec09 SHA512 586bd3a631505608342bb6e10094d178433c7dc35e1fe7876c641dd7544817449aa3e2b0a5565efd6bda5807e85aebe86b296a6c2899cc775c9ce1dad23bba76
+EBUILD ntpclient-2018.244-r1.ebuild 823 BLAKE2B 21f89606ba96d99e57389686cd89deb74bcf879353476158488c006264658b71e17f2763d46f076844d9b822619faecb715f8dd610d0f41cfc56ae3948aa9e95 SHA512 4976c96d64d2a6e6b4a658b7c20d321c509916a6bca96eddfd754c489b640fcbdab0cb0937939ee9b725ee0f39e7ff3f9630b2093ac4b212fdbc71d2fa49be55
 MISC metadata.xml 1131 BLAKE2B ec8fd204149e107cdd9f29528be26e12f7e9f7a9bbcf6c9fc0be38ff6664f28a34285353955ef4cea63e169b025db793af437b774d2697d6b7ab1b77bfb1dbee SHA512 ba48bf738e4fd1288385d04a24d89bacae3c14dd292b29305320ebda63a94effa0e3ec5c01cf98623a76a0d98944e2056d300d2ad45770ed787eb66ab16a4345
diff --git a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
index d3cb200c52c5..8efb23121982 100644
--- a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
+++ b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/troglobit/sntpd/releases/download/${MY_PV}/${MY_P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug embedded obsolete +syslog"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/ntpclient/ntpclient-2018.244.ebuild b/net-misc/ntpclient/ntpclient-2018.244.ebuild
deleted file mode 100644
index d08492748a1d..000000000000
--- a/net-misc/ntpclient/ntpclient-2018.244.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/./_}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
-HOMEPAGE="https://github.com/troglobit/ntpclient"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug embedded obsolete +syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug replay)
-		$(use_enable embedded mini)
-		$(use_enable obsolete)
-		$(use_enable !obsolete siocgstamp)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index eaaa2b105647..47b58ad0b39b 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -8,8 +8,10 @@ AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0
 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
-EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984
-EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
-EBUILD ntpsec-1.1.7-r1.ebuild 4186 BLAKE2B b22105dd6337ff4fcb36d441bec8db8f750c4fc8faf3b1ea9a043535ef5a6b200d55a99101dd310d4223e82fd2ef0902036e85c64a648ab5af5c752e2b3a98a6 SHA512 8e2094a6a796e50d516f9fda942977d00262fb14d7f2134e6b1909faf86bdb2dfe67d8540a52cb5faa027dfab5d940da9457929856ca3e59cf0ff1e35bfead01
-EBUILD ntpsec-9999.ebuild 4113 BLAKE2B a8f7d26adaa2518397851b8d35119a767d24cebfdb5dd6f52a0b6af01c285a9771b15a2ae3770738f2d98ce529dc7713baf0af06732bef1bc9192ccb96b98ae2 SHA512 f0a31da90aa4b3fdd76250bcf17953691e50fbf4c05d0f5fa42c5c95c51e20fc48315e4d61298fee3a9a8615f3193ca4edf88384b92fa54416c017738b01c120
+DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
+EBUILD ntpsec-1.1.4.ebuild 4129 BLAKE2B df2ff391b6f084c8c19d6ef64e7a1f2b161b935fed7959e3b9f5581c11b2f9c95fb9ab5eb6030171a05156f219ffdbb5b0d25f867067f8c19acafb2dd32a0e4a SHA512 1053d16b3ef63b90526837ba4147190c83672ae9928b70665a3f3ebbaeeb4bc642ed87df42ba53ba20c1f8da84b75fd47cfe8bffcdc559af7a10a382efd1a024
+EBUILD ntpsec-1.1.6.ebuild 4087 BLAKE2B ef856f1e3bed036f0ca07f2c70d72f4cceec53510689c578f9b4a4e27799ea41c834daca0c5f10cb2eddc0e74beacad33690e2b21853a4383c08601398753215 SHA512 09b86ab6a59aa19d5eb90a2ef864edb96ea5b47d143625b697bbf0a20135f8445675fea28b652b5e0b4670c64c014c2c171537656250a681113f3c4140081fa6
+EBUILD ntpsec-1.1.7-r1.ebuild 4180 BLAKE2B b5b4d46fbd3e5880b5278bf4385320c60b65e79dcfd4624169618cafe37e421dd5ff0f0dc246460cab0f4dc3c9c62d2a254df23d7cab9b4ca463b6448d6c78f7 SHA512 e59e9764694811e9e7b63021ebdafdc38e4a1d372653d926c352f2e56e15589475a2340ddd96db5248501db8d09a51d605719f9361ef5bbfbe762c4267c335c3
+EBUILD ntpsec-1.1.8.ebuild 4109 BLAKE2B 0c2f48f7d481378a47931659312ab6005855325e1c3c909c7538c2442d0f0e160136a07f4260ca27868e797243eb39d1fbd6a4e1364c261e1c00b9501143376a SHA512 c02087784096401c19771004d4b3dfe560d0b848aef7b44c6b228bf23c85d740bd909babc849f0e75fbb914f040d9550f6da1fb5ff26c3882cc902790038cf71
+EBUILD ntpsec-9999.ebuild 4109 BLAKE2B 0c2f48f7d481378a47931659312ab6005855325e1c3c909c7538c2442d0f0e160136a07f4260ca27868e797243eb39d1fbd6a4e1364c261e1c00b9501143376a SHA512 c02087784096401c19771004d4b3dfe560d0b848aef7b44c6b228bf23c85d740bd909babc849f0e75fbb914f040d9550f6da1fb5ff26c3882cc902790038cf71
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
index fdf4cc4b9cc2..89b9f6d4b4cf 100644
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
@@ -132,7 +132,7 @@ src_install() {
 	newconfd "${FILESDIR}"/ntpd.confd ntp
 
 	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
 
 	# Prepare a directory for the ntp.drift file
 	mkdir -pv "${ED}"/var/lib/ntp
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index 7cc6f74f6d34..8862e1be4568 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
@@ -131,7 +131,7 @@ src_install() {
 	newconfd "${FILESDIR}"/ntpd.confd ntp
 
 	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
 
 	# Prepare a directory for the ntp.drift file
 	mkdir -pv "${ED}"/var/lib/ntp
diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
index 984a26200b85..ec96cc7d8316 100644
--- a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd
@@ -17,7 +17,7 @@ else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
 	BDEPEND=""
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
new file mode 100644
index 000000000000..32a1121feb40
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+	BDEPEND=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	${BDEPEND}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
+	dev-libs/openssl:0=
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		--build-epoch="$(date +%s)"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 0d9f22dc3aa8..32a1121feb40 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index a1c5d1cc9bc6..719daf44c9f4 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -2,8 +2,10 @@ DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
 DIST nx-libs-3.5.99.17-1-full.tar.gz 5287579 BLAKE2B 8ea54a55071e1161a349ecc1c897b1e774f43567e557cb5b06ed296922b87d2c9c613a58b2d86d7ef912d179d44ed09ca2aa6679c43c334bfbaa31edbf0aff11 SHA512 17c782ccd972c0b97de86195b5994e681570f0184813a8200fea4803d51e5033976e7c8300cb37ba6e811e26e526226a3d4e6a469eecdf772cbba7a12adeeabe
 DIST nx-libs-3.5.99.20-1-full.tar.gz 5404476 BLAKE2B 62509b76123373e5bed4e13d20ee22e5d52a2911a2a10db0bb73ba0ace4cd63d1f9e3aa900d4909f9a4b35be783d6b5246940108aef71ac785122982cf30d668 SHA512 7be65506c2345724de6986fca5c90d3a62f8a55e1b978d75e858324f85c63873b1ef882417ad313bf546a96252dc37fdaf401751b75cb71af8209002ecb0b602
+DIST nx-libs-3.5.99.22-full.tar.gz 5280116 BLAKE2B 1a15ba04ace5fd46b007652897aa911a883fa2840c07f4e89db970d3235556ee83600f5cd4d9c4b64f7ce4767dd448a3654412051496754d73a2815a7573692f SHA512 53e7f1ffd8bf9dfd08426e30b0a18433b64f926959ab95132c28960f9a2390e67a34b1e07c923bf11f889088711d7d97c1fd123507f39c2077211d2c3cd6857f
 EBUILD nx-3.5.0.33.ebuild 2337 BLAKE2B a902ccaccafac239a62ccfe6db1543161ea4c47890dc75996744824caee103eb0b6150bcfe10a0befdff4658f60097d06c77d5fd90de79f925e79351ab357c16 SHA512 7e2e099057167fec9639ee20389764d06997a11bb73a94d825dc07c18e563fcba4aa068210e36675c9ca0303edb78e9d564943b26d38e4c67e8ea8ef77a41a54
 EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
 EBUILD nx-3.5.99.17.ebuild 3226 BLAKE2B 1b0297c80b5ed3c963fc0e08fd96e6733a390fabe6f4a6fbf12ca38a92e600c62a82605385b06a23b5dd1aadcdf62a1d35f689aa216f3e50a19c7b0589cbbb34 SHA512 73d03ec5ae9c262855a03b5bc702dd81b660b4beeee43a87ccf24419463fd92e005bb264472eadbe2af0e97947a241150b15ee136c18ef19fab281107ad8b293
 EBUILD nx-3.5.99.20.ebuild 3247 BLAKE2B 36b642b67bbe795887a23d1ed235a07b290ff9c768e986d068e663fb6edd34263c9fc7d14e2934f9555e34612fbd09540ee6808a0c46f8b888b851959a278d41 SHA512 17b97799ee90f68e9be7a51fccb7aec5e0ea5baba4c92578d40bd9516d57c4fe8d8b55ba7a506d8edd76db86c57ebe11024a99e1acf2a481fa5db6a60c2bc6d1
+EBUILD nx-3.5.99.22.ebuild 3243 BLAKE2B 96efb3e409b0e6253efcc1914ae5bf5d1020999e682a729dee71c188126aed73b9abbbf62b1cfae46427c1a65c0365c94e5d321c825b4775df0b5a06ff17ffd6 SHA512 159ee29ca7dc9a1d8ee12ee5fea8a10a0bb1ac28762d08208dc15b547e8d4d15b06de001e13f36c8648c193155ba1865f02d05be7d8bf25b228f889fd509711e
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.99.22.ebuild b/net-misc/nx/nx-3.5.99.22.ebuild
new file mode 100644
index 000000000000..af1c30b085fa
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.22.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="
+	dev-libs/libxml2
+	>=media-libs/libpng-1.2.8:0=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXfont2
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pixman
+"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libfontenc
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/nx-libs-${PV}"
+
+src_prepare() {
+	default
+
+	# We want predictable behavior. So let's assume we never
+	# have quilt installed.
+	sed 's@which quilt@false@' -i mesa-quilt || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
+
+	# run autoreconf in all needed folders
+	local subdir
+	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		eautoreconf
+		popd || die
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	pushd nx-X11 || die
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	# Disable SunRPC, #370767
+	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
+}
+
+src_configure() {
+	local subdir
+	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		econf
+		popd || die
+	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
+}
+
+src_compile() {
+	# First set up the build environment
+	emake build-env
+
+	# We replicate the "build-full" make target here because
+	# we cannot call "make build-full" as it
+	#  - calls autoreconf several times
+	#  - invokes make directly but we prefer our emake
+
+	emake -C nxcomp
+	emake -C nx-X11/lib
+
+	mkdir -p nx-X11/exports/lib/ || die
+	local nxlib
+	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
+		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
+	done
+
+	emake -C nxcompshad
+
+	./mesa-quilt push -a || die
+
+	emake -C nx-X11 BuildDependsOnly
+	# Parallel make issue resurfaced, upstream working on autotools switch
+	emake -j1 -C nx-X11 World \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		SHLIBDIR="/usr/$(get_libdir)"
+
+	emake -C nxproxy
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
+		SHLIBDIR="/usr/$(get_libdir)" \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		install
+
+	# Already provided by mesa & related packages
+	rm -r "${ED}"/usr/include/GL || die
+
+	# Get rid of libtool files and static libs.
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 6991686aa30a..b0d360c2904d 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,5 +1,5 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.0.4.ebuild 651 BLAKE2B ff5122d0ba4b9b4677a6cdefc441be2fd51ac79b87f006cd5eefbe7c5f00600232e569f76e667fcdee8f7b5496c9780858d7cc7c5c8956ae7c2a59627f92bd00 SHA512 d95d826a03b1478f9679d512210fc7bb9b8adad6c7d37cdcabb1c2db0910407e4e7757d1ddbf651afb607df3c4976391f65fbcd484df2129e53008a54e009fbb
-EBUILD nyx-2.1.0.ebuild 651 BLAKE2B ff5122d0ba4b9b4677a6cdefc441be2fd51ac79b87f006cd5eefbe7c5f00600232e569f76e667fcdee8f7b5496c9780858d7cc7c5c8956ae7c2a59627f92bd00 SHA512 d95d826a03b1478f9679d512210fc7bb9b8adad6c7d37cdcabb1c2db0910407e4e7757d1ddbf651afb607df3c4976391f65fbcd484df2129e53008a54e009fbb
+EBUILD nyx-2.0.4.ebuild 647 BLAKE2B ff4154127273b5b95700634d5b4f717e880e071dc53b7caa4674b8e8df665c5ef1cfe1506df815e4725a05bb0d466b08f6d7524d89407d5bd036bebf9bdd2bae SHA512 3d8990e3eb7f329fdeb582bef83aa5b7dcf2b7054a9c77d9dc521ac7fa6896e9364d9bbb9e43faefa8d9d9375b36ba6f20342c3a916d540cb8489c9861e6cab8
+EBUILD nyx-2.1.0.ebuild 655 BLAKE2B c0101655d8866d5e42e30d37695f1472ae9a3f0f594a817998df46bf394a3b5c117f8a9aac4b85184b972c1756a4f0d1be1bc9f3ecc8201e226350616f87641e SHA512 5da53efea0752d17ae915365b3d0c48bed34974ad99af20c0d13a663ede87986b28146b2fe6d1e97419b7dbd56a6ca5b8980c8180138fec13ae9202474a9a34c
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.0.4.ebuild b/net-misc/nyx/nyx-2.0.4.ebuild
index 768da7eff156..4252b76c9b41 100644
--- a/net-misc/nyx/nyx-2.0.4.ebuild
+++ b/net-misc/nyx/nyx-2.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0.ebuild
index 768da7eff156..7371cc1a2886 100644
--- a/net-misc/nyx/nyx-2.1.0.ebuild
+++ b/net-misc/nyx/nyx-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 22fb99bff23b..d134521cfa88 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -5,5 +5,5 @@ AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f
 DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
 EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
-EBUILD omniORB-4.2.2.ebuild 2715 BLAKE2B 82966544593b19da2b9db6c8eb723f51d423cc26e2f4b6cae90779c9b8f45078660dd14848993cd78ee4bc8f7b303d868160e5485edca03e96861be39ec91b88 SHA512 6a35c3279d3ce09f462f166cc3c761fc36dae0fa6c30b632af4beebf944a3f4e47699b082696a2dc044982504f94000f3d28a62aaa80af4750a99e3a771a5002
+EBUILD omniORB-4.2.2.ebuild 2713 BLAKE2B 2ef1001494b824fc3f71995d848c225dedb5eedc4132b084eaeabfb05a3fe01b812a9d4a74cd11608ddbb7779fcc8eb581d6955f65aa482cf2d8e9b65b40d4af SHA512 6eac06118324c8c1b5acfd169d837c81abf9b1f0ace60cb696deffb36bda26dc3687ec8a11dbc826a9143c2d6a14c241b33fe539e9c8954f24ab7a0f581f1987
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/omniORB-4.2.2.ebuild b/net-misc/omniORB/omniORB-4.2.2.ebuild
index 289f1fa2c4f8..11410f97fd72 100644
--- a/net-misc/omniORB/omniORB-4.2.2.ebuild
+++ b/net-misc/omniORB/omniORB-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ EAPI=7
 # consistency we have to force it to use one that we specify. The
 # highest version the configure script will accept is python-3.3, but
 # that's on it's way out, so we prefer to stick with python-2.7 for now.
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 469552be8856..cdba8d833ecf 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -13,6 +13,6 @@ AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e
 AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
 DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1
 DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789
-EBUILD openvswitch-2.10.2.ebuild 4459 BLAKE2B 9dd0a6b338507389561fcae0a4b148d61c9876583510bd4535d1b6a30c4564e6434ad523c94481324ea95727c4b6455fed9b22e0ee046484b4768dc68bedba1f SHA512 faa0d0606ad4d59f84b0052f2c2ebb4e5148937ecc4249b782a298167a2ce2b57958405fbafe9f6302436c4336e4d68242176091b375f778e0246242901acdfa
-EBUILD openvswitch-2.11.1-r1.ebuild 4543 BLAKE2B 389e7ab9fa4d25992a31b70b9f15eade2e29d88a330679ca19fed007b968f14273060615310ede9a3c935b42bc3b09ef120db3790b02b92767db0a191c6384ed SHA512 923b46e9759ea8bc53d91388e175903cd0930d36b0ce9a884a58b0efaa55bc95efe197c323f2bee8ef1a5ffec62dbe7b227e0e9f5d446b62ebec81be6f8a04eb
+EBUILD openvswitch-2.10.2.ebuild 4455 BLAKE2B a3d367019d25741394a6d7cd4c556202d1ff6245b7b464fa0b12b3632aad3ec57161487a3dbca087ffb677838fb6a962ddc7e90ca60fccc2217efc0114a82001 SHA512 715dfb8cef91ef8599ee5910f2f0fd476c42ceac12c510af3bf19746ff782b4e1115e92f24f1937fcd603f105875a481c95df52bb48b7630949ca72ad9f9ef8d
+EBUILD openvswitch-2.11.1-r1.ebuild 4539 BLAKE2B 84c40ce46a963b9fa8a19ea7a4fc7828678184e0652c0f08a12e7076800f534feda67546871f572007bee13d47cd3aa0159c3e75bdd1849c23525107311c78bd SHA512 744d4d7186e3eafbf62a784dbdb77390a4a20dadc4a186507be6ef4913cb84a235de717c8e84eccee0d52542ce458166de9a755f731681220519ffb965bbe005
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
index 0dfc87fec2a1..eebc69958d96 100644
--- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools eutils linux-info linux-mod python-r1 systemd
 
diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
index aa2097f58cc1..a8e46f5ad791 100644
--- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit autotools eutils linux-info linux-mod python-r1 systemd
 
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 7857fffd6881..4010ab5f6b9a 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,6 +1,8 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
 DIST pulseaudio-dlna-0.5.2.tar.gz 701412 BLAKE2B f31d2e5f9adb79fc2882b14582f2787f152675c6f2c97857edf93d6b28fe2d3cbc85badf427665dac44e7d37802365b287e42fd2f8c11bde7cec5267a2fddeb6 SHA512 298f61d643c35449fbb0001efa69a1792e41518953f58506703f3568902da4457d0f4f9e52b9641df26fc6f978670dd29a7f5d786b99339bd2a71f5fa59dd7db
+DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
 EBUILD pulseaudio-dlna-0.5.2-r1.ebuild 1692 BLAKE2B 8690a3a2c4025c435e1b4f2d91b369d37f1a31b5b06db9e5d06d7559f5a802b2aaaf796150ab3480cb1a2381c217049a4d55748451adcca83689a7a5cb5c897a SHA512 0add5a8d68bf0cbb8c1f6dae3b3b089f55014d52fe404b4c3204ed09c4c0c8c4487cb6540c948a4a4838b08c4e67ff161d47c6db6d0ec01a47def7351abdde89
 EBUILD pulseaudio-dlna-0.5.2.ebuild 1635 BLAKE2B 7275dc34e0110f07791d17daea24b8c3bfe1214a081d87d3ac3cfefefd2838056415aca63868fbdf6e11fd6dc9b23ec76da13437168a710b1498b4331329cecd SHA512 15ff8e21bdeae53480132106fa1bba7954eac5dee19e31a611fb02764e9c23b702419360c7ad46ec62321e5c580b5fdc095a9e519280592896d0f542fe8b7ba8
-EBUILD pulseaudio-dlna-9999.ebuild 1855 BLAKE2B 13686e5a0a79823e436e366da8c9fd33e3df009f36d3a8339fefa79ca3d97f199468a4d9df7d090b6de4234cbc202f9f6ed4b28e554916733f731eb06c346ced SHA512 a565e407cc9bb7fb0c29bb19a3305c01e097bf6e7b3b7be70cfdd80d3d912179926ee91ba0ad145b260e1763fcef31da8d2c783838891372350a605a36f501e7
+EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1988 BLAKE2B 07014a92a0feefd1902bb7c023dfb01081109b9b243482071cb9b327f176590616fb78f9bb41f577ce54fa6e8c63a89ac78b442a72f99ea7af2232f1e84d2c92 SHA512 477e5dfac0a8a2130e58811180c70ee681ef69350d8372f891c5235ba2c441d1bdf00a540c9a3eaaae733bad7f3c6937ace411bce5e1107b7e1cba2f18ca4c38
+EBUILD pulseaudio-dlna-9999.ebuild 2116 BLAKE2B f912ad135fd58c1584304d2b3fb352ea997bc89784d3f91c839db051674dd6da3fe55ef194a610013479b099727adb073c7e3b27aa90f4728bab7ed4c314ea60 SHA512 dea99662045c76c7428f8a53d0c4aaeef6aa768b2f47a9ea244de3bd9607ac20345df274377591e4307259ce4841561326271598391cc09308953d70cbe42807
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
new file mode 100644
index 000000000000..b82c8ca45012
--- /dev/null
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit desktop distutils-r1
+
+DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
+HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
+
+SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/b0db8137224f5a293329a60187365168304c3768.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/pulseaudio-dlna-b0db8137224f5a293329a60187365168304c3768"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3[${PYTHON_USEDEP}]
+	>=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/librsvg[introspection]
+	x11-libs/gtk+:3[introspection]
+	|| (
+		|| (
+			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
+		( media-video/libav[encode,faac,mp3,opus,vorbis] )
+		( media-libs/faac
+			media-libs/flac
+			media-sound/lame
+			media-sound/opus-tools
+			media-sound/sox
+			media-sound/vorbis-tools )
+	)"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-sound/pulseaudio"
+
+python_prepare_all() {
+	sed -i '/dbus-python/d' setup.py || die
+	sed -i '/notify2/d' setup.py || die
+	sed -i '/docopt/d' setup.py || die
+	sed -i '/pychromecast/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	domenu "${FILESDIR}/${PN}.desktop"
+}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index ab32925b3a88..09bcb5e33204 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -13,10 +12,11 @@ HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
+	EGIT_REPO_URI="https://github.com/masmu/pulseaudio-dlna"
+	EGIT_BRANCH="python3"
 	KEYWORDS=""
 else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -25,24 +25,26 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
 	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	gnome-base/librsvg[introspection]
-	x11-libs/gtk+:3[introspection]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
 	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3[${PYTHON_USEDEP}]
+	>=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
+	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
+	gnome-base/librsvg[introspection]
+	x11-libs/gtk+:3[introspection]
 	|| (
-		|| ( media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
-		     media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
+		|| (
+			media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
+			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
 		( media-video/libav[encode,faac,mp3,opus,vorbis] )
 		( media-libs/faac
 			media-libs/flac
@@ -50,14 +52,20 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 			media-sound/opus-tools
 			media-sound/sox
 			media-sound/vorbis-tools )
-	)
-	virtual/python-futures[${PYTHON_USEDEP}]"
+	)"
 
 DEPEND="${RDEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	media-sound/pulseaudio"
 
+python_prepare_all() {
+	sed -i '/dbus-python/d' setup.py || die
+	sed -i '/notify2/d' setup.py || die
+	sed -i '/docopt/d' setup.py || die
+	sed -i '/pychromecast/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
 src_install() {
 	distutils-r1_src_install
 
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 7d98bf973045..370056995abe 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,5 @@
 DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.73.ebuild 1583 BLAKE2B 33f94b46afa426085333e04c748567713f0ddf617ef826bc96629b80e496d3378e4a43af6a06ef9056d22782d7dfd4c22f3574367125aa7df740d6c6fad4c1e9 SHA512 189cc8a9bc35da3115389bd1b79427973158eed6a96d33f2aa4a251543bf43976563bef7529660045cb16ad53d1337a63e52da81586ade49333598afc9d12e63
+EBUILD putty-0.73.ebuild 1582 BLAKE2B 922b7caec11440dc2a07706c8bfd26de95cb91295311736a12df3135aec50873ed1d8d76a0d6dcb447747062b936bff790591a000e24c88dfff1fb895ccc727e SHA512 4275e021f15f898346445fd97563486b6489c478b39a67e106fd2d8d166b6a6036386158c5b42656390dc4743b4b58ec1396c4f76650ae9f83c4182b1d827aa3
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.73.ebuild b/net-misc/putty/putty-0.73.ebuild
index 7205f7c6c6ac..5cf6ea3e9126 100644
--- a/net-misc/putty/putty-0.73.ebuild
+++ b/net-misc/putty/putty-0.73.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc +gtk gtk2 ipv6 gssapi"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+	https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
 "
 
 RDEPEND="
diff --git a/net-misc/pycnb/Manifest b/net-misc/pycnb/Manifest
deleted file mode 100644
index 7d0e0fc067eb..000000000000
--- a/net-misc/pycnb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycnb-0.0.4.tar.gz 2991 BLAKE2B cf159fddd90bcf5baa3f11b4335578b8c00d4a6cb8105a0d445cd636b5e94e1436d0674050a42c0689b1dea19a2926582e44b7dcaa607168bb9294a2f3b80972 SHA512 e127525bffdd479a5717230f520602cd1dd587000a1adc398739399530fbb3e06d7bbf3e4f7b24c7bd145f2424427ddb6fc86d6bc597d2cab3cdfc6d554cecf9
-EBUILD pycnb-0.0.4-r1.ebuild 581 BLAKE2B ccd141f491c1c7a1da485ec61977f9260837609ea6caf296c011b0fd04fd383ac2aa6b471b1b69580c1a1e99c67b0dbfbabda4516c8a9d2ba371018d92263e7b SHA512 a61ce520e1636277f04b8a8ddd0825bd5668ae274cbd3c964b49001c890f6706bf02f96a14bc578e2530601c1a3714fa77062ebea07b513010c5a089c1683f59
-MISC metadata.xml 293 BLAKE2B c2e14c7ca874d7b2ec4a768ae44c5e66fad519245dcf470792aeb30b32111740b31f6f4ef0d42813ba9c80c40cb753e0b380667b9f8f0121ae64c6dbe31398b6 SHA512 78d1d04e9a89127917f500ca2510f5b717139167a3ab2ba7892d998ac8c2e52c4900b7a6b3118a97c521e77c8224c016f2f81ab1cfb6901c5c16fbbca50916bd
diff --git a/net-misc/pycnb/metadata.xml b/net-misc/pycnb/metadata.xml
deleted file mode 100644
index 454cf0a6a1d8..000000000000
--- a/net-misc/pycnb/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">pycnb</remote-id>
-    <remote-id type="github">yaccz/pycnb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-misc/pycnb/pycnb-0.0.4-r1.ebuild b/net-misc/pycnb/pycnb-0.0.4-r1.ebuild
deleted file mode 100644
index cec3b7b3924d..000000000000
--- a/net-misc/pycnb/pycnb-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Access cnb.cz daily rates with the comfort of your command line"
-HOMEPAGE="https://github.com/yaccz/pycnb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-python/cement[${PYTHON_USEDEP}]
-	dev-python/twisted-web
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	chmod -R a+rX,u+w,g-w,o-w ${P} || die
-}
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index 424e2ec96b9b..d87b644fd4fd 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,5 +1,7 @@
 DIST pyhoca-cli-0.6.0.1.tar.gz 40816 BLAKE2B 719ca6f277cfd2ecd2100e1b34e1c0d4d7e6849eb0b8f39d2a1628878b4da1bdcc1db622144d815347c33e0148d7fd6303caa661f146e18422169d7ae455c993 SHA512 65ced3bcb6e8fc15d22b0abc760a981af66b10325278613a9276de16c1e73d3b8d325b57aed9d4faf43a6d9eb8167045716c2974d4f6563c7a51df8ee66a69eb
 DIST pyhoca-cli-0.6.1.1.tar.gz 41893 BLAKE2B 39f695224c64dacf0f2efa449ff3e235f22571647e77dd58ed031a0899991337af8deff5808293b4f1e1932a47dbd7af63ab6b86b1c5373122f4678eefec168a SHA512 b83e584f314df936d09cda25b253bbd5f37aa7f57db084424b2696070963a99776284c827f602321329bd066c6f483f32cd3dd0aa961eea7c79aa217949966c7
-EBUILD pyhoca-cli-0.6.0.1.ebuild 676 BLAKE2B c3c543015469c793dfd7c3d4679c2668b8cb951c2a6159e28ee7af9d69a4a0282ab56d772ab88ca7b78256910110c078839019c8206d446a0700f03f6f4bb689 SHA512 3f10663f7eb34e17dbf511f4976b95381a55df5d3ffc20e66e650e2a017bcf6dfe0bf1e3932405e33f9cf2188f0fd0fe4c6d357586f083821ff6f9a7c9cf2f3e
-EBUILD pyhoca-cli-0.6.1.1.ebuild 678 BLAKE2B 1e7b77a44baca4abaf3725534d38bd0c3608fa655a5fccd8e0ac0f187603236ea0a09bc7b0540bbc96cc387dea14cb88c81768e017bb9deb2854634d039fd546 SHA512 2041c65eda10987ca99ac68ae6a382f69c798332f6d94038de8056090506a5aca7a846b804905ea7bb3a62f1b267fd72a7e95fc156cbeb06aaa6ba0ebd56a2f4
+DIST pyhoca-cli-0.6.1.2.tar.gz 41891 BLAKE2B a3183acc8b4a809e5b3894bbcb276972f3bf0178f2a9f596e697866db4217ca4e04d6b3d698b202e124a2e42a3b1f9b2f0fbd595bf0483f55dd7dbe9ea108ef3 SHA512 02bb6a0dcb72bc67e8b8109e554f04fa57d5b2da2682b50a081b60e19c257842ae31aabb7faa945579fb23d0e922befd0678c413b31393d368b4173e0d4315f6
+EBUILD pyhoca-cli-0.6.0.1.ebuild 672 BLAKE2B badce678cb6853a0de5494fbaaa545fb2f3e8d97051c5a43c43ddc8129bcb281fcd3289c86391d4515c9f89857f2d1d450e7574faa40583878ca864e4d3deb67 SHA512 ded8ef0280e40809b8ba67f8530e1eb9f592a57cf6293674dec38a2fdcdc5b16e82acf40809c73d391491a03edd118656bacfb5a4c4a6ee56a6e4814b9afcd41
+EBUILD pyhoca-cli-0.6.1.1.ebuild 676 BLAKE2B 031904f49e0d1e02b3f04e7fc2c3317199dc8d58b084bb9cd55b8a9c630850d8f93f8dd113cb3f855ce9da80a0eb33d5a33ffab2838063ff02169e1cbe4c7247 SHA512 8ec1723a60526e5059d0319424a12a97a06cacb62f70a1453931b337791bec0e97bdcb0d1c59789ed450e5fe9c108b57e548ae812b765dda16936841083f8166
+EBUILD pyhoca-cli-0.6.1.2.ebuild 676 BLAKE2B 031904f49e0d1e02b3f04e7fc2c3317199dc8d58b084bb9cd55b8a9c630850d8f93f8dd113cb3f855ce9da80a0eb33d5a33ffab2838063ff02169e1cbe4c7247 SHA512 8ec1723a60526e5059d0319424a12a97a06cacb62f70a1453931b337791bec0e97bdcb0d1c59789ed450e5fe9c108b57e548ae812b765dda16936841083f8166
 MISC metadata.xml 521 BLAKE2B 07e613991af22f75609d554e9c533773fb4ae1b00227c717dde027b16cc14c5a31c0144b8970dc8095e2eabd62d3bff0578b290489eb44787611b860120ed35d SHA512 7be8e7f29191fc70cfb2c9f3482dc536803ba374996c52fb8c7011c60c0f7de0b10ab333792ee59b391d04e8a74bd778a30db7a6722118e612db232567527959
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
index 858a77c4648b..9624fa19556f 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="X2Go command line client"
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
index 30c368003023..e6d1d46e720b 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go command line client"
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
new file mode 100644
index 000000000000..e6d1d46e720b
--- /dev/null
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go command line client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index d283365fc43d..b8d870921e60 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,5 +1,9 @@
 DIST pyhoca-gui-0.5.0.8.tar.gz 2064483 BLAKE2B 63bca5be8673ef4e274caf4e0813b73f5dc8af7818b7638b2ac7411bb1598272bab573bc55c6c5e48fc45cc185bad907594b99ee0c96546683ecd8dd1ef1e3f1 SHA512 35bcbe35056d718ec5b58733b8569fd40cd6843a6661cc19deed02287cf65e03b4812fc82bdb0d54b12a78d5547456463e8adf236d4a7f04e11d0d462fe3eded
 DIST pyhoca-gui-0.5.1.0.tar.gz 2098593 BLAKE2B 942caadb43654dbd65cfb50722f17b93b2becd410b90fb888a5133974b66ae377ab568204288e3a72441b74ad3e08a31190d67452a41086802177cc6a8f01406 SHA512 ae4287ccf2aadc4a6557c3bf37d01eb2cdfa542803ece41df02b7b816ba5b0be918231b40dba3c39a850064ae39907befdef1b80180649446b49fc975abbe312
+DIST pyhoca-gui-0.6.1.0.tar.gz 2098973 BLAKE2B fdd145bb8ba67d70571a2244bded2f5c30382725c21747778c7490a98cd85dd7e872aec9ba539d407764a9a3a38d590aed5742268ebc38aa9cfaa3fc5b5a679c SHA512 d2730aa52afd4a835e593f3d8bde84435abb67aa490bb05807353d8d102c1d85564c21decbaf04e5cf54ef4a376247cf4a5ba1f7c9baf96149dbea9e583ea9cb
+DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B 944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0 SHA512 e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6
 EBUILD pyhoca-gui-0.5.0.8.ebuild 806 BLAKE2B da301c05769a3fa90efd30a45330d4baae3eccd8a6a59d97b13906f4a7a95e2e3995d219edcfc3f7e457c1b062ee65ede0a8c73c0564191aa3b0d05f2a400ea1 SHA512 c95d09e557617176ace03d0a13b5101fec19b2702846857a67881b58273dc2eaac6a7cd5d9e1a60c7d3a5e2c98d492b93b8e042d014e2ca9b9259d39c4d91597
 EBUILD pyhoca-gui-0.5.1.0.ebuild 806 BLAKE2B 0e09632aee60f0f892ca93f2f083d504cb37368b2b39aa78e9e1c5abcc859e0bc5012f7535f466b17d5e4678574783702769c32ef5ad8803da218a5e4b6c9622 SHA512 b732a04b77a69de556e2f631efcc2011a4a7168e98e3f0ba1251de346dc8f6ab95b64fe90f21286ddb9d802c785df16f2dca56540e07ceb7066edd147f0c6597
+EBUILD pyhoca-gui-0.6.1.0.ebuild 829 BLAKE2B 4097744f1e248597b3e51b88b8face37e305bd2fbf04f09b34746dd873174aacc6ec98de2a6d8328935360e9dfe25c59cb881ccd72c72948a4286a1c45f8f14e SHA512 92cb3d3c3634033864a8c7c0562b5b5edcb801ec236a4eaa4e54a6a7be8a9272ac33e1f9838eb5d03cfb66a1794feda54b4c70e32df0caaa3b640f24b6f017dc
+EBUILD pyhoca-gui-0.6.1.1.ebuild 829 BLAKE2B 4097744f1e248597b3e51b88b8face37e305bd2fbf04f09b34746dd873174aacc6ec98de2a6d8328935360e9dfe25c59cb881ccd72c72948a4286a1c45f8f14e SHA512 92cb3d3c3634033864a8c7c0562b5b5edcb801ec236a4eaa4e54a6a7be8a9272ac33e1f9838eb5d03cfb66a1794feda54b4c70e32df0caaa3b640f24b6f017dc
 MISC metadata.xml 791 BLAKE2B 7f823d058d401072a1e1407391c2eb02c0b70705f5beac53656d582b977455201f0687c3b93653314be45339dfc749a81a06197a3e6e1b0c78205986fbf033ef SHA512 5e05aefac383cb0cc65e2747aa5d9eef23b2f26931196fa544f263a0c0bf2dfc63c026fa606fd910ab589f447d3bd78f42de0bff61a44286964098531000a5cb
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild
new file mode 100644
index 000000000000..45f64acd9e49
--- /dev/null
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go graphical client applet"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]
+	x11-libs/libnotify"
+DEPEND="${DEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
new file mode 100644
index 000000000000..45f64acd9e49
--- /dev/null
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go graphical client applet"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pycups[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/wxpython[${PYTHON_USEDEP}]
+	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]
+	x11-libs/libnotify"
+DEPEND="${DEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/man1/*
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 9fe8e5040796..c5360eb04b3f 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,5 +1,9 @@
 DIST python-x2go-0.6.0.2.tar.gz 243857 BLAKE2B 9e64ed5f28a231396ea5322c51942814df2d80f1df092c1a33b1884bbadcf4b27b8180b3a2f9b07001ac3e90ab2e65bde594f83d3adadcc788e0236d738bb746 SHA512 883c26b01bdcab9e57f4ef4ac5a980f849cd2df849c77d1b82e11bbb1872c6e97f3ff8b02c841d8e3acd425f3f55da2613d31a3876ffcc91545195aae5f88d77
 DIST python-x2go-0.6.1.1.tar.gz 247188 BLAKE2B c19f1ea39bca647984a21d0100d07c3898dbab894c92d5aa36c297ec277f9f0cd3429e02e6ca7a372b57ba3836d2139018e6d685fe31719549d2d2ddefff483a SHA512 8450ea47d1ec27abd56db0925613bd864a620cde98954f21d1fe8bcbf2a0024d4e8237c8663d04eb67c835f7d9f4a8c0dfc5f8f5671f571b24bb5b48b0a70762
-EBUILD python-x2go-0.6.0.2.ebuild 602 BLAKE2B ce7d2e0dabc87fc36298214494bb95b000823f561a13d9d453b888bc0d929252bf3ea730e4b8ab145ab003b5df75252f8274b864cce9fefd7d8bb038a5e43148 SHA512 b94fd3a989739df4c8badf16bcf0aeb927536ac310164d991cc8cfca26070b55072ea286f83ce1954e41a7fdb4e8faf415fe140b012bbf796b62ebce7485752e
-EBUILD python-x2go-0.6.1.1.ebuild 604 BLAKE2B d10d07c38dcf39b6f1e8bfe8d28577ac8b654ddfd6613d5c8301c16749f95d1ed27d45bf8c295d3e1389ba5195c9200f4ef0854b34a21437de2ce83dc2a682f8 SHA512 c328e66061460f81b828ff19869bf9f9b2ac8dd644c10078dc4849265fa8b3db616a8469a82a02729ce9b62a63aeea31707031ec8b9f544ec12406c70ca2d02e
+DIST python-x2go-0.6.1.2.tar.gz 247187 BLAKE2B dacaa406e7f32eb14951e54edd31fc812f7f6c5688a911607f4cf1755c1128eff5f2b77bb78b66f6a49df2267064cc1e8d209bcc1b368abff1b451d69eb63b04 SHA512 29ac73415c11f19e07a919bec99d61ba04f24e98c51bb32b5e4cdd20cbc04c7c6420727c5147b450e0e37931ee77dccc02334c62a8657c11bca6689472446e5d
+DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc
+EBUILD python-x2go-0.6.0.2.ebuild 598 BLAKE2B ef5b5b838576ee41d105433a87c7397d9c6e6527959216a65e80e40c61af21a0f0f8d929ba6c1eb9cb4adba076a390176ccd4253aa067e995c979d211d9768b3 SHA512 0f6d6c99a1dc934963a802c9cb616531e1720b2adf38d2c79cdd8a9d56dda5d38de879818960bc356070f387faa1a2529a9c2d2bea3dbca88f06123e44097cf6
+EBUILD python-x2go-0.6.1.1.ebuild 602 BLAKE2B 20996dbef1ee83cf9cb448d07b14a6002636949a511c3fdcd2821d0f00a044c5418fec8b12d04b86cb6b0872c388756f5b4ed921a8ad9a61ecbc41ab1e9da042 SHA512 c1ee3f2e34c2aa8cc365cf8d7aa504ddd75029c2cc7e722b8905d30a16371619c27e12632a6d5b3e5a495691d73167bb61166bb854fad1952e11806ac085b8ee
+EBUILD python-x2go-0.6.1.2.ebuild 602 BLAKE2B 20996dbef1ee83cf9cb448d07b14a6002636949a511c3fdcd2821d0f00a044c5418fec8b12d04b86cb6b0872c388756f5b4ed921a8ad9a61ecbc41ab1e9da042 SHA512 c1ee3f2e34c2aa8cc365cf8d7aa504ddd75029c2cc7e722b8905d30a16371619c27e12632a6d5b3e5a495691d73167bb61166bb854fad1952e11806ac085b8ee
+EBUILD python-x2go-0.6.1.3.ebuild 602 BLAKE2B 20996dbef1ee83cf9cb448d07b14a6002636949a511c3fdcd2821d0f00a044c5418fec8b12d04b86cb6b0872c388756f5b4ed921a8ad9a61ecbc41ab1e9da042 SHA512 c1ee3f2e34c2aa8cc365cf8d7aa504ddd75029c2cc7e722b8905d30a16371619c27e12632a6d5b3e5a495691d73167bb61166bb854fad1952e11806ac085b8ee
 MISC metadata.xml 483 BLAKE2B 556d85d173fd848484a7ede8e26d1b66fcfc95c49c1231b12273a6e8bbc42c4421fbc1933f7aefa846369f474caa25163095774daf6be7680c6b3b79b09c3e67 SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e
diff --git a/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild b/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
index e9d9ddc2fde1..26afdfe8c042 100644
--- a/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
index 05ccc95bd653..5403c9b1cca4 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
new file mode 100644
index 000000000000..5403c9b1cca4
--- /dev/null
+++ b/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go client-side Python API"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
+DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	net-misc/nx"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
new file mode 100644
index 000000000000..5403c9b1cca4
--- /dev/null
+++ b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go client-side Python API"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: minimal USE flag in net-misc/nx, we only need nxproxy/nxcomp
+DEPEND="dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/python-xlib[${PYTHON_USEDEP}]
+	net-misc/nx"
+RDEPEND="${DEPEND}"
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index a5c885e77655..68c288f5fcbf 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,7 @@
 AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa
+AUX linux-5.4.patch 531 BLAKE2B e928e157f0e77da1857715cc2c5d8ecc37e968dd4c2d2f4bf754b0f3c40abba148f8e2da33e1df9e2265022de2618a9aa9c1a45a3fe9ebd72f83fa5da35d0531 SHA512 8f200510dca69ca2ab3e856b4b0f43e5ca62035c1295d66562c88c596aa9aab3e361ec3090106cdc4fa489aa416b92f2417bf1e9847953d50822bb7d85325641
 DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563
 DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6
 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
-EBUILD r8168-8.047.05.ebuild 920 BLAKE2B dab9ae702be8ab8a3831cd5bffa59cc50568a39fac3151808fbc13ec35c8b3564b13a952784361ebb4a02f12de3464ae8b8a03b125706bb01f27bd77d0bec7ba SHA512 6fa701e698809e092cec6f333218b01afcad37e593de77b4875c5f22af3ac38013569ba8280954bee6c1618b55d004a27c0707aa424f1e9e37b4edeb108479c5
-MISC metadata.xml 484 BLAKE2B d2e95cf281876ff9ac28d8c35fb696b4a813d40abbe84756f7cb83f6b6c495f89d6cbb3490ef7813eb0bc3b60ee31bfb00c14b6f4a351c7e14e207537cccd0f5 SHA512 7abfc4933b44ad4365a455892cc10ef3797827f87db77e8b8349e19f6d77922bf9c3c094e5f5c29694bc240e43ac72e88daf3acc3ed8d63ffd4b90554fe9e67e
+EBUILD r8168-8.047.05.ebuild 964 BLAKE2B 9f22ada0e96b4c2eb3694d3f3a701126a63d83aa604b4bc54c07dec87643a082f667eba18d3fac61da233dbec632b19e11b97e6e11ddda577ae7832d49752f9c SHA512 19b08b997d683619659e27291db7ec96bc21fcfc373cf917fb7231745c27f7e2bc8d921a07510309381cb6c5f036b3e4d84cb6cb1c48e514f7e011bac03eb4ae
+MISC metadata.xml 402 BLAKE2B 85f808730ecf18c69caa2f0299d881ad0e23956515ff7bfa6941a9abf0b89d5c994e452fd9b6e0e10bec8786cb056d83072fed4dd990de4403317a97c26f3ea8 SHA512 ae3047ed24b4b998463b7d155671ddb1e960af5fd50da7f0f6ac2f831628936f3c4917bbf5622688fc4ee19f9faf7c91b7990b37eb29711bb1ca11ca5ee0878f
diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch
new file mode 100644
index 000000000000..197983597be7
--- /dev/null
+++ b/net-misc/r8168/files/linux-5.4.patch
@@ -0,0 +1,12 @@
+diff -Naur r8168-8.047.05.orig/src/r8168_n.c r8168-8.047.05/src/r8168_n.c
+--- r8168-8.047.05.orig/src/r8168_n.c	2019-07-23 10:22:09.000000000 +0800
++++ r8168-8.047.05/src/r8168_n.c	2019-12-23 00:55:34.121947346 +0800
+@@ -56,7 +56,7 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
+ #include <linux/pci-aspm.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml
index 31b4221e42ea..cc09120dcec1 100644
--- a/net-misc/r8168/metadata.xml
+++ b/net-misc/r8168/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<longdescription>Official Realtek r8168 linux driver. The following cards are currently supported:
 RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C
 RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription>
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 5d05429e616c..152d2ec6ffca 100644
--- a/net-misc/r8168/r8168-8.047.05.ebuild
+++ b/net-misc/r8168/r8168-8.047.05.ebuild
@@ -19,6 +19,10 @@ BUILD_TARGETS="modules"
 CONFIG_CHECK="!R8169"
 ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
 
+PATCHES=(
+	"${FILESDIR}"/linux-5.4.patch
+)
+
 pkg_nofetch() {
 	einfo "Please download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 3c671185873f..7867697ebd2e 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -11,5 +11,5 @@ DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3
 EBUILD radvd-2.14.ebuild 1780 BLAKE2B bffba6c9142fc616df9f90e9702a86d64f66dfc84e72d8af4ff04ff26497d4c04d05565ff52dcd68a45cacf4200cd1cc568c9cfcb521f9062e1a61a26211c65b SHA512 8d08e06e8330d3b8be8c0e89d49b0ced2852859839addca7f1f9372e3f890b525c63879f1fadf8472e3de78f9895c0eb59af5c8be0cd783027c7a7595f435740
 EBUILD radvd-2.17-r1.ebuild 1589 BLAKE2B 244445f1c94240d2d2d7739fb64713f11b96a2f9aa1beffa0a079ae94fd3a4bbdc9dba608057fd7a7ca310adb88ac321c29f774336e3c4f7ca98ebeb3ad4c851 SHA512 1e0012130901f74c226f1244090d466f8c38241e65df7c10aa8eb2ea36fb221b9cd05eebe19b96ae9522b372fbcda051340de5d0a78ddd799aa42d867b5ff100
 EBUILD radvd-2.17-r2.ebuild 1645 BLAKE2B 303f8ab038976467a87bbeecf9436fdeead1a617e048e39983dfad93e871b755afc284d92f924d93933423bdf541ed1c65877464c2d98634f66d3d8b6c9839b0 SHA512 9e5e6365141af4ba90086f3a70ba74f325e9b6cb0292c96473211d4f69cd274150cd9c8684f49fd42136140875f4d2a75c034c3c4186f7850d09ba08333ea328
-EBUILD radvd-2.18.ebuild 1601 BLAKE2B 48afb15ce5f313dba190c65a428153c22e1d2536cc3bfddc696b0f3fc853c672c1a5a5d5b73235948eec9ec6d518e2772d015f56e08694caf24f3e91bed84d9a SHA512 e17334bc44597613394bab79c04faa4fd4933f3485f0114fddb8400aeda934558ba33ae670326b8715d49a7fa97bfce6a338ce8e539ff50c863b8e71307845c9
+EBUILD radvd-2.18.ebuild 1608 BLAKE2B 6a18e6753dfccf345a5b55a04c5e36344b7f84890171a5cc57d3e315454892c74d12cd6198fe45a0dc5cfba1f23a112fd125046f3c6ce0f5baa53ecf29fae553 SHA512 2f4de432226b8cf6779b53891cca844702ec3b12884013d73fc0a3bfe82039a86ab148f79c0c5a1bb945dd9258171cd6ba92b62996693e8215528525a2cbdf04
 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
index 2076f18bb70c..083d081966d6 100644
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ b/net-misc/radvd/radvd-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 sparc x86"
 IUSE="kernel_FreeBSD selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 46c8556b23b5..a51c9a6e23c8 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -8,5 +8,5 @@ DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af384587
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 EBUILD rdesktop-1.8.6-r1.ebuild 1825 BLAKE2B 719b968928addf924edddc9e4266b0130d820e69c63672fbc6e4b29c9deed82782ec3fbb7ad4965d732ba19b48a3d7a7089941189b99b19864145407a48fc0c0 SHA512 252c717a7d630ff951400b5fe9100c1ad277fdf957522d37fb4ebb9f89fd4e2df94349084275edd0e8360caca3a85ed9d2e8bd859bf0aa1d11650a0d36efaf09
 EBUILD rdesktop-1.8.6.ebuild 1779 BLAKE2B 7babb9b744d549177311e42829179047b79f54a852418fb41d93131185278be0cdf0a59851a99eaeab1b280ed2ebe7194819c119e76808467212cc6f786add1e SHA512 bfcaf2817c1a1e452ae33d8b25b9f144e29b19204aa1f02da34d69882f441b46eb57e8b4442eafba6b45d9910fa00d8165ba5690c36c18e5424903631807552f
-EBUILD rdesktop-1.9.0.ebuild 1705 BLAKE2B 0c0ca98332054fda07914776cb4888058676440f21559146d6b94c2edcedc28a6b88c39aadd93cd2c71bbea98377d07b9b6996eeb0cf829ef87361a23e507159 SHA512 706f50eba61539499541fb912bdcc374a14161dc5c6305d6e6e32164459b395ca85ca4863f9995c42f39e5881becce6f725fdf98c9c59197a917818931a557e3
+EBUILD rdesktop-1.9.0.ebuild 1698 BLAKE2B e79aa0da4d76dd8c352ede9a97e24bd63f34109b05f9c91b248c175e76fa5047097fcba2110cf5a84322fcf57de07b53d7b65d60cef8faeddc35fee2d3c0a507 SHA512 e0240cfce9e59089fc5bc0b88208dd9b78278bd9bc7c151f31356bd5cdc5151412e1db04dcbdcf302ab97c599b53e860bb13b19292c65793922f379dd09693f0
 MISC metadata.xml 883 BLAKE2B 9ad73132150a724eb69cf65c62aea7cb0530e45fb4ca0395bb916cc95f48452b2dbd34edc7116ef9b8184527ea2dee16213b419185eac7b5aba8346dc7978cbc SHA512 5a68b2d8f23e4039efd76a52ea19400b2d17dfb01d0cb16504914bd0e2fb6f0523a135e7e98a19d7a0f371c1b149cb9426fc308303a0fa09a0bd0ebd118c1ea2
diff --git a/net-misc/rdesktop/rdesktop-1.9.0.ebuild b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
index 9ff04c378e55..e7e480499232 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 20b3dd8772f3..09d7d07fe6ad 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,9 @@
+DIST Remmina-v1.3.10.tar.gz 1651065 BLAKE2B 8d2f3068ad0938c4641deb2c20ccef10e30949273a2db92a9ff8bf4e84e49aa0bc662128f8fc576f98baa3cb0f4b19273399118a3ce5d7b5aa92ff03cc602cdb SHA512 e6770fee4d9c694c7c85a9937a293db437456840eee107de4adaad0bdfb1d649bd66b1f28ee0f196386eb968a2f23e139429db22f32febdc62ce02c0a4d66f7f
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
 DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
-DIST Remmina-v1.3.7.tar.gz 1611711 BLAKE2B cccf874a23faf72d8dc93c92e06036e7b19dd5fed5ee9c1d860ea7ed559d02b6120ac1347677626951c5e6c5c2ee7da9e5b022386d9d483acc3c16e5aa3b75e2 SHA512 a88e2e751c5882134ced22c3faf80fcd1fb32e48cdcab61e823b6f77ca806006d309ef492e7060f4862f5956b3443bc482b6e1495acb1a2df2beb3a64c4fb00e
+DIST Remmina-v1.3.9.tar.gz 1627404 BLAKE2B 4077b38e987a93f71f96597784949522659def04ad0d2ab05c72bebb94a3bbf2c2a222828965aaf76b0273a378950b5dd0e7acdb7543f0d6c7f3220d16eb281c SHA512 f87d30d30d6d9692f60cd27336ac0059a4374125b231cdf1e3710785b08fc77722112ea48e5717958b03fc5784abb9fcd86aa5a427c4d634cb3f2be1aac41945
+EBUILD remmina-1.3.10.ebuild 2546 BLAKE2B 3b869a8f591e2836c1a526bf2a0ec76ffaffaa1d5137ca7080d7f5c576a3aa051d429a3b72aa9309dab9ff282842944a02c5bec9f717f1a0e400d08393ff078d SHA512 d8e5b18a021c82d1c1d0dbaf7ffa82e13bac987cc9766d018ff50d2854a827648754fb00a7eb3d53d8479611a46ccde19c58e0d41b83e167af28087572ff9090
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
 EBUILD remmina-1.3.6-r1.ebuild 2477 BLAKE2B f0912aab7e270c36283a9a82a04f3f171ab5fc56e084aab967b701faaa3cdfde7d556c13fc2c3f232a19923e32856dc7e8e80aa0a01b3aadd6d6b9af1a8ef633 SHA512 ec36b830cfeb182d5977913982b829a7fad1fe8c7230781b8df59eb80ef16ee5218f13860cea8a99513fc3aee0cfc442ee90de248ec65729ed0034f9a4e6336e
-EBUILD remmina-1.3.7.ebuild 2479 BLAKE2B d25a1515cc3973af45ed83881be16e163593c90e18b66ecf8f2687ec140eccf68b509f447ad2b410c9613345d46a41a15a1213dec343e4f2d446e4bb1452a97b SHA512 09d31ba2b791f621e4cb14ac865815a2292d0f01c49720000345e5105615764a48ca9646a5609121e6a2158c999b8ac3b5ceb5e6ea2d8509d471f2d97e6355cd
+EBUILD remmina-1.3.9-r1.ebuild 2546 BLAKE2B 3b869a8f591e2836c1a526bf2a0ec76ffaffaa1d5137ca7080d7f5c576a3aa051d429a3b72aa9309dab9ff282842944a02c5bec9f717f1a0e400d08393ff078d SHA512 d8e5b18a021c82d1c1d0dbaf7ffa82e13bac987cc9766d018ff50d2854a827648754fb00a7eb3d53d8479611a46ccde19c58e0d41b83e167af28087572ff9090
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.3.7.ebuild b/net-misc/remmina/remmina-1.3.10.ebuild
index 78a79a444080..42a9e58cb1c6 100644
--- a/net-misc/remmina/remmina-1.3.7.ebuild
+++ b/net-misc/remmina/remmina-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ayatana crypt examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+IUSE="ayatana crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
 
 CDEPEND="
 	dev-libs/glib:2
@@ -27,7 +27,8 @@ CDEPEND="
 	x11-libs/libxkbfile
 	ayatana? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	kwallet? ( kde-frameworks/kwallet )
 	!libressl? ( dev-libs/openssl:0= )
@@ -63,6 +64,7 @@ src_configure() {
 		-DWITH_GETTEXT=$(usex nls)
 		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
 		-DWITH_SPICE=$(usex spice)
 		-DWITH_LIBSSH=$(usex ssh)
 		-DWITH_VTE=$(usex ssh)
diff --git a/net-misc/remmina/remmina-1.3.9-r1.ebuild b/net-misc/remmina/remmina-1.3.9-r1.ebuild
new file mode 100644
index 000000000000..42a9e58cb1c6
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.9-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( net-dns/avahi[dbus,gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index fb32593e4932..c6f41589db50 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -2,6 +2,6 @@ DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f6
 DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
-EBUILD s3cmd-2.0.0.ebuild 578 BLAKE2B e4993d884f0d55282bfb13c6faeb59c7386d169e0ee72b1323791b645ec41cb93bdeb11eafc567c6c9321fdf9d088953654e6f923559300f41b701d23f494b9e SHA512 d47c44fbd2ab0ce4831f56e631f1e9d0c5b480354f19d8f20829ce34aef99dc09ba9f4d4f79c06ee93a8472659bb64b902bca68dfee0337ff7abfd6dcff7ca95
-EBUILD s3cmd-2.0.2.ebuild 588 BLAKE2B 63c26445a24da6ace6b796b93af97eb7770c660666d716d4a42ef3ffaa4cbc10f14a0547ad5ca2e43bfc8a1c0a5f38c64246283614c70c7eb425d5667e853de7 SHA512 e0dfa4db2e7a8ed2758f63eb77815c3dd3ec5fe57052141a099ec72e4bb449c642fcc7e4421c10f153863cee30ea3a1da40443037baa9e1027e9bd59557688d4
+EBUILD s3cmd-2.0.0.ebuild 574 BLAKE2B 693da05f4b6497274abd3c051322fb8f1dc3bac9fd394670f8c9fb14a49237960c261ce29bdba7b2d8743c469415a1f5987be6d16c783406f1d288e15053cd2f SHA512 2edac608d4a048a4fac86a85e5cf4bc54f64387359c56cc48a67b52ada7744a483ab9cdaabbe15a8d45ba21aff615b3e200751bd0356f0ecdc3e65bf213e2c07
+EBUILD s3cmd-2.0.2.ebuild 584 BLAKE2B 3c9903da3f1963db61f3daeda879d69438faa56e10f9c2905caaeb5b70b3bda6320e6860d38a4f5cec4ebd0e0738c789feefe9d46255a13145340421dbb9d56c SHA512 5f0ffe7c9546a804d41a7925aee3679ce48b9da60c808474fa0cc2e784357d719ca7b89324801181354472148009d5e66597b0c1f802f230fc4c8663f1078e0c
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
index bc6cf82929aa..85265b4c3792 100644
--- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}}  )
+PYTHON_COMPAT=( python{2_7,3_6}  )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
index 07a0a31cd32d..177832594fbe 100644
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}}  )
+PYTHON_COMPAT=( python{2_7,3_6}  )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 3f7b840516c2..6b9dba114ad9 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3
 EBUILD s6-networking-2.3.0.3.ebuild 1627 BLAKE2B 3d7db35321240f1445f904066c3b5d686c7533df0ef5b67c2264374b12f149d67039602e2a9ff4d8ec841c6bc8e91b51e06e06235a3c99abee99f08def666865 SHA512 804818cb31c44e11aa9d9a43c5c1a2f9a62cadd93abc9994d6ff9d77ed1e08dbab56a1940f1d092ec38a160d98bc3147f6583cd093b5f0e16d03dc163b7ef9e9
 EBUILD s6-networking-2.3.0.4.ebuild 1472 BLAKE2B 295b4795452b0f531e4a499346380f61addf9af31597471872ced7930ddde99c94f07accc1456b467333e9acb383493a0c76152b38f28486ad5156113679853d SHA512 88fb58f470a98c77d898dc7fb3d5c1817c319f7c75136aac0428135694186ceef766d2e1fd9371535d6143566f2780a1532159fbdfcb1dbc2e847ad54c20d2e0
 EBUILD s6-networking-2.3.1.1.ebuild 1472 BLAKE2B c660eb7f0c4161a6dd9d7f6fa3744c1bf876858c797b1c7a146253e2d562a21f8ffb1d3543fad14cfcdd5d8706ba3b7e9569f7e81093ae087614f5ef34ff7dcf SHA512 ad13653e8c3441d681555986c2e51eec0b7a3ef7e50f2ee398121d656a047819ee87b65d4142b33894291a6940a3b1f469611c726ff8cb3c27b86ee6a385ff80
-MISC metadata.xml 970 BLAKE2B f9792b261130ed67ef4d8c39e2d2527af114ffa21c0fbb1213b9fda6f76235254b77521ecafb551345694e2a3334837a6f03f208048b6b109b06decdb8d9dd57 SHA512 29c7d44849f2e08812af16e5da7ac72858d9deff240d8ee71dae789b498e1f7385f3b94f39d87672ffb625eff4b4645f441858bf9463c269510439bb7c3987bc
+MISC metadata.xml 867 BLAKE2B 977455d49b859300280a7418a4381e2e2a96d20c7f58b6218c46f189726d2663b2a7bf8bdedb54445fce4433fca53b61bbcb26f15985bc82055011e3a8025999 SHA512 88e6118c450411e3d0f5ed386bbcbceb98d811b6b6b17566894fd2c749fb1469cb607adcc64a7b896b36e80ae4120b91cc179fa993789fb4cd5d4c85dba32f98
diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
index 0f888cc49b6a..db1fcf0a4b67 100644
--- a/net-misc/s6-networking/metadata.xml
+++ b/net-misc/s6-networking/metadata.xml
@@ -9,10 +9,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 8d3e38ed5f6b..5acbf75c1b51 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,6 +1,8 @@
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
 DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
 DIST seafile-client-7.0.2.tar.gz 2365981 BLAKE2B 9e11d3e2b770f2b85bb55f0108344c1c69e1fb28ea69ea8a5022efc7811f6336a2fee0de4f38981343d7a29270051e292c14f656d7a7b99e0d646d0f3fee9a9b SHA512 3edafb9728eb39e1b2adbcb0526758279599d25020c5303aa6b610aac1296eef0ebe66447f6555c21dbe125aa5ac1d605736359b52f2bd8933187efd04c2e8df
-EBUILD seafile-client-6.2.11.ebuild 1106 BLAKE2B 5610e8f4e38a4b2287b1f9dc2efaa3cafeae444412aab0e36ce7a01dfecb4c153b2e6e91a0088c8222701b3c9056fc415909af245d730109bf195964e74fded8 SHA512 38802b16e0bae3b31cf15e0d3df8b7c938e0833485e9b04bb17132477f86d3c2358980c9613a8faaf32b30766d0b7e33df90fa384c346df26b765365ea0202c5
-EBUILD seafile-client-7.0.2.ebuild 1116 BLAKE2B 2fec5abafda283a0d0a670b655ec85d7e1ed3f0e9b98828ad5fedcedf900bbb3423dbb516a3bd94e59d7115fb9283cdc9a8a2dae9cf7779e61565d1fad823230 SHA512 815a189dd7852cc588ccc5a2b8d0ed518712ca2b83e87a691ac6efb25e3f79afaa71d85bfefc98b12749ba733a15b33c774134bf81eb3e0ccf9de6b507387276
+DIST seafile-client-7.0.4.tar.gz 2357414 BLAKE2B 9c3368d745d30f57b313e9b5351714097403e67519a4582dd5658cb97152f4ad37c32cb9e6f47c13f199c75e9bd42c529ef0d352f363da815f486c90c305779c SHA512 9073df49639045319e971a76eb3769c184617e179694981ad88ddd02382b4ca50ff92c26239757022270e0a0a4115c8b70ca7efeab6ff2dee78e90a7de1bf5a7
+EBUILD seafile-client-6.2.11.ebuild 1088 BLAKE2B 361dd8fba4526094d41d08d91cda65da848a1b8677b94e3de056ec227db0e98bc8a0b41dfb86d652eac7993646ee93b3b3c3c2743bf5bd659b8bc8aaf3d6f544 SHA512 9e01233d8f5d8cbb100f226c844cbe21eb1381d56a99de246c723ad7fb8abfe978ac8efd74714a963b55e9ab41c91ba1d072352cbc95be3c21991fef9e93faf9
+EBUILD seafile-client-7.0.2.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
+EBUILD seafile-client-7.0.4.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
 MISC metadata.xml 541 BLAKE2B 994b8936e2a25627989635426eb7f2e3a23f1943b2c5908f50a789bc1f5f84753efe6e305effb1046bb4948224c068233079fac0003e3f5b2beb507aafdac9f8 SHA512 4ce109a926de9d456bf209ff539f57e15f11c8bd486ea1984658383f5435fbec3ae7b8a77cef45409f5fc6a7e4c6c91b7890bccb6e8ccf3eaa721b92d916a33f
diff --git a/net-misc/seafile-client/seafile-client-6.2.11.ebuild b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
index 311ec1fd77c6..77928c949098 100644
--- a/net-misc/seafile-client/seafile-client-6.2.11.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -40,7 +40,7 @@ src_configure() {
 		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
 		-DBUILD_TESTING="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-misc/seafile-client/seafile-client-7.0.2.ebuild b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
index 972e54b95f82..fa31e1e217d9 100644
--- a/net-misc/seafile-client/seafile-client-7.0.2.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-select-qt5.patch"
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -41,7 +41,7 @@ src_configure() {
 		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
 		-DBUILD_TESTING="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/net-misc/seafile-client/seafile-client-7.0.4.ebuild b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
new file mode 100644
index 000000000000..fa31e1e217d9
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	dev-libs/libevent
+	dev-libs/jansson
+	dev-libs/openssl:0
+	dev-db/sqlite:3
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-select-qt5.patch"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 3dfbdfa7f80b..cee6ba99f2e5 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,5 +1,7 @@
 DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
 DIST seafile-7.0.2.tar.gz 698373 BLAKE2B 171ef14253c260d0e1ed9e984219a545bc5c86895fd554223148515feeb8fd2c6f9ab802f0f505ada0ed504def01999cdd254683de6e0d00f77272eb9d491f4b SHA512 f348139662edb061bbb2da534cd099619f23e09b1383cc97a53116c7e1eb5b41e95d61f719a83f3a69d3914e64836baf15900a9597a7b6ddfb8d23f3e362b8cd
+DIST seafile-7.0.4.tar.gz 706114 BLAKE2B 8abcf24b752eac20e2abeb355c79d420c0cadb374e70739be76531e9ecb6cb3428f6d8c0aeaa6cf5638a9dd5e964f9ae72b4933fd379655149790396dfe9ffb8 SHA512 2eefbb928f3082ba8373509c149e4e1fcfe960f10baba227759ed43411d5adeca844f1538609fd1046f22661322c57bbf93ede1fa849a39e50a4af8a3a7febc1
 EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
 EBUILD seafile-7.0.2.ebuild 1049 BLAKE2B 535fe6fb71c373a01ef4749c4d4e5dc94082069c05c933a08c6512d14f4874eb626cf74ced0830626d5817167bfd5ce1e068e1dde8ff382de2296a520f7ff99d SHA512 f98355eb1e314085de614899e6ebf8b9e23f15957d0f77e95b8fa5a90eff7ef4aa459c7f87f40438659490326e06524e5be0b64d3fb64f24b5aaf0735ba1e3de
+EBUILD seafile-7.0.4.ebuild 1091 BLAKE2B 308d133ab906e450236d76a5c39dda016c629331aba1479d92137cb6c6c447dba87632f931531e61efaecb0501c8eedf88f45d7556d8348a817b8fb905c272cf SHA512 b2365ffcac7a5c69e6a4194500313d78ba8810b236e32b0b75a08538d307489a0e9353bce91a564856ba0e128a11f07c2fce7c3b926fffd64e522656547f7381
 MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
diff --git a/net-misc/seafile/seafile-7.0.4.ebuild b/net-misc/seafile/seafile-7.0.4.ebuild
new file mode 100644
index 000000000000..bbe3738676be
--- /dev/null
+++ b/net-misc/seafile/seafile-7.0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{2_7,3_6})
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libevent:0
+	dev-libs/jansson
+	sys-libs/zlib:0
+	net-misc/curl
+	dev-libs/openssl:0
+	dev-db/sqlite:3
+	>=sys-devel/automake-1.16.1-r2:1.16"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
new file mode 100644
index 000000000000..20b47dab2a15
--- /dev/null
+++ b/net-misc/sipp/Manifest
@@ -0,0 +1,4 @@
+AUX sipp-3.6.0-parallel-build.patch 309 BLAKE2B e5c790cae99c31ba4cc79800f2991787401865b41bc270ecb648a9534da0322ef0b0a4f029146c7fca013f295565bc18c8c424139782a42de779b75e775e3b3c SHA512 41b052b3612cc3cd4afbd0a1437a4502c27e3cd948d800a4229c99561a88d1dc488f1feb06aa68faae83d9acec0977e3f4be2b65fef4cd5c541e2b4a023a9ff1
+DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12
+EBUILD sipp-3.6.0.ebuild 960 BLAKE2B aff654d4ba7a2a4bf00b5151242e9fe57f711ac6fe67e2d7e6746955f4d55f2226b6181fc423f61ca115ac95228be64b232326d8d4c4a8950e5c601171cac430 SHA512 1a4585f9b910b5e67f2abf71409c09515af2713b0199456a34be6a23bee89a24fec66f6840790593bd29c980ca02f5fd613c5292c23604e7ae6e921d2fc57728
+MISC metadata.xml 456 BLAKE2B f7dff8c7cdc43d043f5a84c590e084a0ad39f973738a58a991f9971794c4ea904df0e95d47b7669ab0f76c193586aa8feea6b1414111d374af301dcd44ee055b SHA512 0268164af9c3e0e1558549021c47b9374f5f565996a730335d5ff7c8132f7e8bd2685c36db74dd9ab7be2029ddbb56250519b7b0bf85d54997d247a4bb26365a
diff --git a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
new file mode 100644
index 000000000000..6521918339d2
--- /dev/null
+++ b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
@@ -0,0 +1,11 @@
+--- sipp-3.6.0/Makefile.am.o	2019-12-22 10:40:37.766229344 +0200
++++ sipp-3.6.0/Makefile.am	2019-12-22 10:42:09.006266083 +0200
+@@ -172,7 +172,7 @@
+ 
+ # Ensure that after a reconfigure the source is cleaned.
+ .autoclean: Makefile
+-	make clean
++	$(MAKE) clean
+ 	echo > .autoclean
+ BUILT_SOURCES = .autoclean
+ 
diff --git a/net-misc/sipp/metadata.xml b/net-misc/sipp/metadata.xml
new file mode 100644
index 000000000000..2308b2753fdf
--- /dev/null
+++ b/net-misc/sipp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="pcap">Enable functionality to replay RTP data from a pcap file</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/sipp/sipp-3.6.0.ebuild b/net-misc/sipp/sipp-3.6.0.ebuild
new file mode 100644
index 000000000000..5ffd92882ca4
--- /dev/null
+++ b/net-misc/sipp/sipp-3.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
+HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
+SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${PF}.tar.gz"
+
+LICENSE="GPL-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl +pcap sctp +ssl"
+
+PATCHES=( "${FILESDIR}/sipp-3.6.0-parallel-build.patch" )
+
+DEPEND="sys-libs/ncurses:=
+	gsl? ( sci-libs/gsl:= )
+	pcap? (
+		net-libs/libpcap
+		net-libs/libnet:1.1
+	)
+	ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gsl) \
+		$(use_with pcap) \
+		$(use_with sctp) \
+		$(use_with ssl openssl) \
+		--with-rtpstream
+}
+
+src_install() {
+	default
+	insinto /usr/share/${PN}
+	use pcap && doins pcap/*.pcap
+	dodoc CHANGES.md README.md
+}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 65599b3c196a..8bbc1f7bac6f 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,3 @@
 DIST smb4k-3.0.2.tar.xz 3824972 BLAKE2B 6f15bac77840669b9f9a6640e35f5b36b76653946bcef9d268452fd813c796480594b40744cf86ec5d79307294fb2f9592dc71013576efcb6c8fc607599778b9 SHA512 b60d50732ba84bae9e58f90ec18bb0fe59185814ec92e4f8adc1e699cfce61019f919fbdac2555b365c495ab1720f62b35b95c063f0c7c9466dc31487b8cb564
-EBUILD smb4k-3.0.2.ebuild 1642 BLAKE2B 341972b4680fffb18aae1a8c8d20bb62d7a8ad1e7f8c81322249c4bba068fe20cf96594106b5dd1e21b41f8bc0b265bad45039fe0d9ffb40fad5c585979669e3 SHA512 93ff90d6a354248e89b8beb07f30971245f32a55f444f8643bd6252650ff39cecd16e999763fe1b4b0c9a0aebff65e780db5441067e01e1e9349cc71789c3cc9
+EBUILD smb4k-3.0.2.ebuild 1885 BLAKE2B 9691707dd4a740bd5362589fff7dd94512321290766614db09d9eb2279ba21b0bb1275db5f1212caa562a58fe3bfb1b356bf3000fc3d26643ba185fa9e07ceb2 SHA512 a5dd55ad106eec283ad5d8df383d5cd0c362806e0caa20dfe5705d78b9894ebd2135d746f39ec8a41d746e43c66eca1916d65b1aefd9bf9a771221aee6f59675
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.2.ebuild b/net-misc/smb4k/smb4k-3.0.2.ebuild
index 3d15898cf828..e0e0813da5aa 100644
--- a/net-misc/smb4k/smb4k-3.0.2.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.2.ebuild
@@ -3,11 +3,14 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
+https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
@@ -15,38 +18,39 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
+SLOT="5"
 IUSE="plasma"
 
 DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
 	net-fs/samba[cups]
 "
 RDEPEND="${DEPEND}
 	plasma? (
-		$(add_frameworks_dep plasma)
-		$(add_qt_dep qtquickcontrols2)
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
 	)
 "
 
@@ -54,11 +58,11 @@ src_configure(){
 	local mycmakeargs=(
 		-DINSTALL_PLASMOID=$(usex plasma)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	elog "Users of Samba 4.7 and above please note that for the time being,"
 	elog "the following setting has to be added to or changed in the [global]"
 	elog "section of the smb.conf file:"
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 37348928f827..4284d10fb370 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -4,9 +4,11 @@ AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d936791
 AUX socat-9999-stddef_h.patch 1272 BLAKE2B c6ab67b4aba676387b3d1584b03741ff829d5455991e67a5a0262cb529b965545e2935fa733a7c9a01a8c36cb2378d6d3e443a978a8993cab55bdf06d724d260 SHA512 b951fbc1d8fe26babe69fde1acc779907e00866c1a6bba85e37a4e173948ad2ade9aa7835a0e9ea1ec8902d0b181ebb11ace57ff0f8ab570301d8d35849e939d
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
 DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce SHA512 6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
+DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbec99df447668b0eff67d82eaa1cb513c74e6f58d927969f110baa38b5055c2015e6dc837064e3e2f1dbb63b214 SHA512 9c60d66cf7b190cb41d2d2afb2bba5bb3982c301df5f8e989013d4d7e32a2b15ddccbb26a4d2ef84f65412e24efbe85530e7178d03b2ad86d78d7addec9a8c63
 EBUILD socat-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f
+EBUILD socat-1.7.3.4.ebuild 1423 BLAKE2B 277ffa091d4aafda88ffc74bb72b3b86aae32972b08210d78671daf39407cc8c3dc9de2ecc2308e3e32349ebebb276f27f70265b125c454a7df385c811c04644 SHA512 01654151affdacd45431288e2e36e7cd2a08596b9a6979083e1c725e3ee552c3fc2d59e218bdbbf1bf4ac1112b23202c6cc7b11fadae266f8cf5074d697843b3
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
 EBUILD socat-9999.ebuild 1337 BLAKE2B 63b3a50ba7f79887bd0769cde62604b61322c8f8ff0ec14dddc6cd6a7e271600914f6ef17ba37f68677f247e4567343b0f18ca4ffe757416f190ba703ea1dbd0 SHA512 d3153b16916abff983b91525eea488945585a6817561aa5471528741af6ef0cbdc440ddbce3086ef238f7056d053e209b451daab098299b98d185b6df3037c8c
 MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild
new file mode 100644
index 000000000000..5c208be530b6
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
index 66ec9c133195..6651f19f3d9c 100644
--- a/net-misc/socket-burst-dampener/Manifest
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -1,3 +1,5 @@
 DIST socket-burst-dampener-1.2.0.tar.gz 3823 BLAKE2B 44a24eb357647873e328bad302e89cb08ec48389deb0e2abb9b7cfcba32001805929b3e5df0045ca38e64d51fce0784e9bafd17b9f840d65e0114c25a4228592 SHA512 e2130abf33c95255dc4249fb82a628b2569a0db8582f4b42b07b0c2c88d7f3968634062a4befc9ab4a257c750e31dbc5ffc5512a9b1ab2e34c8f660f598da080
-EBUILD socket-burst-dampener-1.2.0.ebuild 649 BLAKE2B 4126e418c3acff83b83380ce715e4d415fdb08e0242f06508acbd6bca4cbe661c2399ec3f96ed4a0075527a41e224836932f9186f6936415edc712872a497a57 SHA512 ad1d4988a37530ce289d94e2a55dba3771e307202f4256e0b398147c23e0489cbae1295699f48088ac0fed001febfa4702ae019eeb778401163d5c9ade091573
+DIST socket-burst-dampener-1.2.1.tar.gz 4438 BLAKE2B 5fc8a52370c3314f625f71f1ddf816300c4aa423b09c2ec8501372246dd982d4166dbe47260c5a44675c26afb1f83f0ae9d696950b4c754c17303481a5d536a0 SHA512 297c4371700508091850e7022f8a1f245fb90720ec5fb2b482dc8bc2aa2a47a0c9087c91827cc4a95ef1cbd546cdf005e61a160c9f78ec2d7849ec83f79ac77f
+EBUILD socket-burst-dampener-1.2.0.ebuild 645 BLAKE2B f09e23bf7f5aa9a9ee2690a8c046330f025604e3506c81873c13df58b48475180116fdba09b77c304170c06d571e86ff392d657a18140e561dee666882bbd7d0 SHA512 9301ba29269c28435fdc7c439cb9bc7fec3e044c258db6ff42b6de864326785bd2dd172e2911ad52d87100e203e17d5d9881a2c09ca27978b0d174c129ad1d0c
+EBUILD socket-burst-dampener-1.2.1.ebuild 651 BLAKE2B f419b9ddc5401f31d3a55465d39b03bfb4b1566e6817774494fe25f9e139dccafa7aa757b00d09e73ce32630686e0b8d98bea66d5cc25323146f02d130691886 SHA512 65fc4724dc5beecbe5da7b8ec24650a430bde2062a79c761135349f6d707766ec75906fb147d4f7231cd61fe02925db359c2cf80d97c235f384f6559201da018
 MISC metadata.xml 312 BLAKE2B af48a35f7fa9f645522293faddb615bea586daf209350d9697863ddc979f489863cbad923786c8dde79284d103110347f095ca0dfe8913ea328dbd9d142255bc SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
index c9e0e36c5d90..961f97283cfb 100644
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild
new file mode 100644
index 000000000000..047476560a10
--- /dev/null
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A daemon that spawns one command per connection, and dampens connection bursts"
+HOMEPAGE="https://github.com/zmedico/socket-burst-damener"
+SRC_URI="https://github.com/zmedico/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN//-/_}.py || die
+	distutils-r1_src_prepare
+}
diff --git a/net-misc/ssh-chain/Manifest b/net-misc/ssh-chain/Manifest
index 36429717edb3..8ddd3d1e29ca 100644
--- a/net-misc/ssh-chain/Manifest
+++ b/net-misc/ssh-chain/Manifest
@@ -1,3 +1,3 @@
 DIST ssh-chain-20131217.tar.gz 3956 BLAKE2B 64df261f9dac1d614d9095cd77b407cb6da44cd1cf97b043834670df63bb5abb7397074c073d7c0a2c10edf1cc19fcda8182a9e1ecac6b8a58a07f793e524d0c SHA512 7d9faa9bbce44a50ca56d65fd778d35f79c7ece982e2bb0e424471c866f9cc584390484dbed73447473016fe5de4564e22883d3dda4aa54e167853a3e0ce2975
-EBUILD ssh-chain-20131217.ebuild 797 BLAKE2B 7951e10858129fdf4018b824f27d4b151f0844f8903421308e3ddbffb14d6736502f32d5f6cb606eb339b56cb5fbaf296d619bd0f6e753d1404efe1efc8b52e2 SHA512 ba404d05580c0b37167fb2632357591061e1910e26e4c7bf4ebcc2ea8b6488f8d05851382a2c5fec9bade4531debc23210d9fa87888775eb1f8777a3a2f78f01
+EBUILD ssh-chain-20131217.ebuild 826 BLAKE2B d7402d6dd3111adaec2a37199367a33b39fbc0bddecc9c9f6253f1878eedeca9dcb83d7921d475fb3ec13cc1bf2395993947b748f5177832d3ebc1ccae0ccf10 SHA512 bea8e8094dcc1965eb45b77f29889ee65582755edb3ff05ab635cc80bedba40b066bff8188fa71ad0998ee303926f77720232b1f13492072c11e9b9e3e1383c2
 MISC metadata.xml 339 BLAKE2B d88a6cff684d3e348f9cd681a48578fd57d774ff0ba3cb1f80308fe1c38a5d72ddd02b54f18a292464c517b5400d804b1685093648ed97b9508a2db9f33e7d74 SHA512 573a755a2936fdf1abb1fbca32a61d3b6bb097ae70cdb75348fca0c5d031e9a55e85e97ba4d56d658581430c68500c10a7a46c48d89d21a31ba24481be179681
diff --git a/net-misc/ssh-chain/ssh-chain-20131217.ebuild b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
index 896d1ece4208..c20032d46e66 100644
--- a/net-misc/ssh-chain/ssh-chain-20131217.ebuild
+++ b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
@@ -8,7 +8,7 @@ inherit vcs-snapshot
 COMMIT="c1bd9d82d750bf001d12a9cd41b9b24a3fd84f81"
 DESCRIPTION="ssh via a chain of intermediary hosts"
 HOMEPAGE="https://github.com/ryancdotorg/ssh-chain"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ryancdotorg/ssh-chain/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index ea8a442e9930..29d5c5f7b05c 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,5 +1,3 @@
-DIST sshpass-1.05.tar.gz 98362 BLAKE2B 59a48391cd41e467b7ef2fdd14dc1ba4aa769868955326bc26ce603ce4a71780a431c6900ef67ef2d5a5940450b06605da46cfb1f5b6782aad92f2cbe8f67964 SHA512 92ff3428a3cbc2b517e8ee0a6676b409bac3ec0900bfb370cf3882ccc62017edb695ce00e025f73680e9718e1b0213b2ac1bbd2a2558fe43f0f5a7b0d690c810
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
-EBUILD sshpass-1.05.ebuild 412 BLAKE2B ca5fb0b4473ff91a6698e7465db9fb0aab6be4d36a2a95eb424e18f8cb0d5aaba2908e9a90610c6642341c4367ee2132d97ac4264275b20356b6fe845848da93 SHA512 fb0f31b88c7cc637c475bcf1834cebdb9930036b01f52718ccf0454eddd9eb24470e2d0c5a845268ab92549ef75a4c8df646511a745a4ad01df5acf710eb7948
 EBUILD sshpass-1.06.ebuild 400 BLAKE2B 9fa468f10e3bed856be325f369ae3f2050f3dbeb68c92056b599c9eaa56376ca2b01c6e573a870cdf371b138783d24cf11afe585b92aba6e8c7370ffa4e9a5f2 SHA512 2abba4fc6da22ce3766c0ebffcef1ff922c16667b3df7f70a276f91b55c5386f0bf3c0d56238bd05e23a378275b3aa9434d9a899b9ff420430037607cc203c8d
 MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6
diff --git a/net-misc/sshpass/sshpass-1.05.ebuild b/net-misc/sshpass/sshpass-1.05.ebuild
deleted file mode 100644
index 0e949b82869e..000000000000
--- a/net-misc/sshpass/sshpass-1.05.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Tool for noninteractively performing password authentication with ssh"
-HOMEPAGE="http://sshpass.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE=""
-
-RDEPEND="net-misc/openssh"
-DEPEND=""
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 94dca6bf5a21..b5e963c099cf 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,8 +1,8 @@
 DIST streamlink-0.14.2.tar.gz 643695 BLAKE2B ea28daac32903738206226bce85a4615338b6039be1e4cce18325e977112c3301d6e6ed90d1210f4f362c898397fd980c136a98d8a0d5ff7ee2b6c5cf077f2c6 SHA512 0d9f1db32915392f9d29bcfb40743058352a924435a8ee77f1218c108e937204e88041c908d2f93546beaa70e18db62c961ea31fbdd85c5e7e4315a18118e276
 DIST streamlink-1.0.0.tar.gz 674393 BLAKE2B 091272bae71f1e89cf14872578091a01f9d05ee372d4b9379e672280735c6800a33ae198bf019fbb3e970aa060ef059e5106e1be3a20602874be6206b6303bf6 SHA512 22ba96ac0ec27fe923b99898c45548df88ed3dda3bcbcb10b55fea145e20731eb8aa3a90212a5863b4ef5a7387d4bcf3d09d447ea2789762a8cf5eaa87f263d7
 DIST streamlink-1.1.1.tar.gz 681973 BLAKE2B a027074e7346ee1758f86456d0d3180bdb3cdbe9be7da232971fe6ece0d0723afa963bff67cef410757d85f7dc356f2a409ad3e84075c03328bbfa995fce796d SHA512 e493e7775eff84b7c70e60606296c71058b0c4ea25920ab6b2efa09cf45765c4b23287258729b60622e57594e7458a320e47301c1821b7211d49f366c73998cd
-EBUILD streamlink-0.14.2-r1.ebuild 1893 BLAKE2B fb783af2bc1305f6ae4d0485b940ec6b3da5c73e371711e64168f106945d42606830ba1b795175a8f4fa346736c6c8c131811e5b032959a4402d3ae69be31e4b SHA512 5ff297079a681046a0e726074e3174045375265320d030cf5389cb7c50c194e872fe3df384db4beb1dd01b8576a297e8199ee56330369e8c2a83c819b54f4897
-EBUILD streamlink-1.0.0.ebuild 2043 BLAKE2B 4f9efa20e69ef976c786608268e8c2211cc02e5fc356f9df559ef720e77ad7a60a10ac93917da8795d5f3784af6e2f51271c0d120acd81c73d563c4742e1e576 SHA512 e2337cd1cf57216079ccb38c21c671f4728c06c6dfcf7bb390d3af28689069e60b23537674fd00b7606489304c2d14ac35f129ad3601d80acd498a48d2bd9574
-EBUILD streamlink-1.1.1.ebuild 2043 BLAKE2B 4f9efa20e69ef976c786608268e8c2211cc02e5fc356f9df559ef720e77ad7a60a10ac93917da8795d5f3784af6e2f51271c0d120acd81c73d563c4742e1e576 SHA512 e2337cd1cf57216079ccb38c21c671f4728c06c6dfcf7bb390d3af28689069e60b23537674fd00b7606489304c2d14ac35f129ad3601d80acd498a48d2bd9574
-EBUILD streamlink-9999.ebuild 1566 BLAKE2B 72b45f447c3bb961d777bb8ff906bc360c029cb692aeb3ebbeb35049c739a289d82d459fce016afbbffe2878afe097685c410b5d80d5dbaec631eb949577f794 SHA512 731e7196d8b5544042a3299e03db4e75eb95a7c909fc43ddb0f19decf86f69d6e2f50f4013c2f829e384d82fe2d374bc5671dff41088261b2115733031f7a1de
+EBUILD streamlink-0.14.2-r1.ebuild 1889 BLAKE2B 495ae1d316bf239fd6910e287610ebe438594494993cca4c9a2d2cb555553e96657e7d8def9985432579b6d56199a22c5a369e523f7730598da03e549d9529ea SHA512 201f463a3262be420b6b403601c9502b2baab44ce55258b558360db21906b815c386f0bbc866035539eb0ee46b11effd4f5d83c20bdb25d5ec3b33f3ad43df41
+EBUILD streamlink-1.0.0.ebuild 2039 BLAKE2B a78eb21752f5be2ddd563b414416703e05660c74f9fcdafa53856c9556fe934480af22e401db70ce83b978e96c52eb5e3b14f3501ee122980aad752ffad45643 SHA512 9ac0bf69b28047cc81bf0963086a8c0d45e1b29d753482128528d5a90f3ac334a320df3c18447ecbb01bff8dbc8185770f0f27dd0dfc5d37e08a7e4d3173e41b
+EBUILD streamlink-1.1.1.ebuild 2039 BLAKE2B a78eb21752f5be2ddd563b414416703e05660c74f9fcdafa53856c9556fe934480af22e401db70ce83b978e96c52eb5e3b14f3501ee122980aad752ffad45643 SHA512 9ac0bf69b28047cc81bf0963086a8c0d45e1b29d753482128528d5a90f3ac334a320df3c18447ecbb01bff8dbc8185770f0f27dd0dfc5d37e08a7e4d3173e41b
+EBUILD streamlink-9999.ebuild 1562 BLAKE2B f89e8a302e66532ba4688a24c5504e0a5d956d389fb6ce15343d93af60d94165dc5a8f2e65fcc3c00e43bf5dfefc4361006bc533d1f9d5391b837e2b6fae86d7 SHA512 649263e86fad9839771b9aa64761937b6940f3d11e656c362249fc03de920bb90159915c45d1687c71ac74cf0de4609700ab97b1fabbd467a9d7bbc54d046681
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-0.14.2-r1.ebuild b/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
index 7da7b06bc738..04e080e8c0e8 100644
--- a/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
+++ b/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/net-misc/streamlink/streamlink-1.0.0.ebuild b/net-misc/streamlink/streamlink-1.0.0.ebuild
index eb8f741e43e7..7e377f5f2164 100644
--- a/net-misc/streamlink/streamlink-1.0.0.ebuild
+++ b/net-misc/streamlink/streamlink-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/net-misc/streamlink/streamlink-1.1.1.ebuild b/net-misc/streamlink/streamlink-1.1.1.ebuild
index eb8f741e43e7..7e377f5f2164 100644
--- a/net-misc/streamlink/streamlink-1.1.1.ebuild
+++ b/net-misc/streamlink/streamlink-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 4419ab99197d..3fbdec990c5a 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 
 inherit distutils-r1 git-r3
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 456145c10608..627b8329e37e 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,8 +1,5 @@
 AUX stunnel 1259 BLAKE2B f407bcff9249e57c46f641e8b666c187f3279e14d7d28f3565063887d8ef01b8379539fb7bb6a70d00e80809a203dd3a263de6c96012f5357b7e059044f0ca34 SHA512 c35855a20ca29d5277eaa597763db434ec069bc96e91bc7c2bbe3357c72ce792b84f653c59842cd2921cce810005cb79717fa4e728840766aff51656033585d6
-AUX stunnel-5.43-compat-libressl.patch 5328 BLAKE2B 5a014b47e3a314ab2d016ca31fb98d8a4fd613816c38382ece2a9925be217151130fab7d14666aac2602513c1cb0af04742c6a80eb9b8bf51caa46fdc05ad4b1 SHA512 d45e660fc610636dc93b8f696fc378cda4fcf7989f22aecff6394f84bbddfabb70255ebc4a9291a29806b3631767bb64b826c4a9fb2ecfe0ab7e53aebcdc7eb3
 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4
-AUX stunnel-5.51-libressl.patch 10288 BLAKE2B f403d620b6b1341d3934e560d8d7e81fb6567c5076c3c46a34ebafe7136d95e2c9bf0f1d56818384040e0dcf5a1a4e1e10afe29db1f32ff2008cef30b83a8da5 SHA512 d8c8562afeaed5a8843e08d50a5097a4e36a10a014ebe281d8ea0bc563ac5b9bfa9d884f8cf6008b58bf679a7e785d86b331cddcb0bd5e49ed664763d9b3e597
-AUX stunnel-5.54-libressl.patch 12341 BLAKE2B a46445e80f54ce9a912fb7b255600f3598513305485004249f11354312db13cbba8b7aa95a4da0d431ee0bef6e5c049afaa2d14b41d3ac4f222f8cc4ebb8e933 SHA512 1d85b587a36e2d78c0b97fa90829156a7123e860d323010287cee43bd36a803e490313e664e72b44ed54ba5e89a0920d8d8608b6ac269663892610c62f4240b0
 AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
@@ -11,5 +8,5 @@ DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc
 DIST stunnel-5.56.tar.gz 981163 BLAKE2B eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b SHA512 db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877
 EBUILD stunnel-5.50-r1.ebuild 2791 BLAKE2B bcd255a5bb328074fde280a0e089de4a2f008ee025ad10f7807995dcc463918c1a62bcf4c8303aafa8fc0d188d7d5de1cf7bbc816cb4a3b647501d97ca6bb5cf SHA512 cd97d5c1d19f5cc5c85d00c5f5a45315492beaa8bee29f6d4858095ec920768232ecc36ab70adf5aa96cec20dd137a3d8e5a3c97695ce725941805baa511f8b3
 EBUILD stunnel-5.55.ebuild 2773 BLAKE2B 410e8651d827f95ebd49c9d1d090beffb738c02a937764deb76afda893359fcad08cea1b867cfa9723af711677008ffa1ef6d178a497b36cbe678df9bda4c6b4 SHA512 66711c72febedd4ac825567bce53c2577c35f494de1d2dd1c12eae56dd0cf70deaef1c57dc332fe4321898fe894302e371b5f13f6b47b7ff9fd617a12795b275
-EBUILD stunnel-5.56.ebuild 2789 BLAKE2B e344d3ccbe579d5a781b2a67dad384f36bf6ab0cc5d3eac2e2ed5b5f0ad6d17d08bee075586df81ad35d79c1678ada18e19f83524eac3f65bb71de6f633bd112 SHA512 6bcf71ff7c426851c6577c2b71af19b2380445182d5abae643c66ee6364cc601b87a23e5a59e14128f77250254165cbd675735f15d90625b752c54654d0ad37f
+EBUILD stunnel-5.56-r1.ebuild 2754 BLAKE2B c4a0442bc0c1f6c97d961961b986d3f30c92e8fd9062c3472c6a07f3095efdd5dce7585c10c27f827a6af9b1d1a525361b4d4b9d6a9d44e6c86ddecab1182c13 SHA512 1957ade6544b696fd993b2f94bf57543eadbccfadcf347ef3cb854895df624c3c3c6089dd3339bf12ef043e4c2a9cb0cc4ac1c3b8aeba8fc4331817756b87566
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch b/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch
deleted file mode 100644
index 5b015a98b610..000000000000
--- a/net-misc/stunnel/files/stunnel-5.43-compat-libressl.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur stunnel-5.43.orig/src/common.h stunnel-5.43/src/common.h
---- stunnel-5.43.orig/src/common.h	2017-01-02 14:27:26.000000000 +0000
-+++ stunnel-5.43/src/common.h	2017-11-06 13:42:39.940942240 +0000
-@@ -448,7 +448,7 @@
- #define OPENSSL_NO_TLS1_2
- #endif /* OpenSSL older than 1.0.1 || defined(OPENSSL_NO_TLS1) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- #define OPENSSL_NO_SSL2
- #endif /* !defined(OPENSSL_NO_SSL2) */
-@@ -474,7 +474,7 @@
- #include <openssl/des.h>
- #ifndef OPENSSL_NO_DH
- #include <openssl/dh.h>
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
- #endif /* OpenSSL older than 1.1.0 */
- #endif /* !defined(OPENSSL_NO_DH) */
-diff -Naur stunnel-5.43.orig/src/ctx.c stunnel-5.43/src/ctx.c
---- stunnel-5.43.orig/src/ctx.c	2017-08-17 09:18:53.000000000 +0000
-+++ stunnel-5.43/src/ctx.c	2017-11-06 13:47:55.571861529 +0000
-@@ -295,7 +295,7 @@
- 
- #ifndef OPENSSL_NO_DH
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT STACK_OF(SSL_CIPHER) *SSL_CTX_get_ciphers(const SSL_CTX *ctx) {
-     return ctx->cipher_list;
- }
-@@ -398,7 +398,7 @@
- /**************************************** initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CONF_CTX *cctx;
-     NAME_LIST *curr;
-     char *cmd, *param;
-diff -Naur stunnel-5.43.orig/src/options.c stunnel-5.43/src/options.c
---- stunnel-5.43.orig/src/options.c	2017-10-16 18:38:47.000000000 +0000
-+++ stunnel-5.43/src/options.c	2017-11-06 13:46:18.630650320 +0000
-@@ -3656,7 +3656,7 @@
-     }
- #endif
-     /* engines can add new algorithms */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS|
-         OPENSSL_INIT_ADD_ALL_DIGESTS, NULL);
- #else
-diff -Naur stunnel-5.43.orig/src/ssl.c stunnel-5.43/src/ssl.c
---- stunnel-5.43.orig/src/ssl.c	2017-10-07 14:23:08.000000000 +0000
-+++ stunnel-5.43/src/ssl.c	2017-11-06 13:42:39.940942240 +0000
-@@ -51,7 +51,7 @@
- int index_session_authenticated, index_session_connect_address;
- 
- int ssl_init(void) { /* init TLS before parsing configuration file */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
-         OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_LOAD_CONFIG, NULL);
- #else
-@@ -87,7 +87,7 @@
- }
- 
- #ifndef OPENSSL_NO_DH
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- /* this is needed for dhparam.c generated with OpenSSL >= 1.1.0
-  * to be linked against the older versions */
- int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
-diff -Naur stunnel-5.43.orig/src/sthreads.c stunnel-5.43/src/sthreads.c
---- stunnel-5.43.orig/src/sthreads.c	2017-08-17 09:18:53.000000000 +0000
-+++ stunnel-5.43/src/sthreads.c	2017-11-06 13:42:39.940942240 +0000
-@@ -216,7 +216,7 @@
- 
- struct CRYPTO_dynlock_value stunnel_locks[STUNNEL_LOCKS];
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- #define CRYPTO_THREAD_lock_new() CRYPTO_get_new_dynlockid()
- #endif
- 
-diff -Naur stunnel-5.43.orig/src/verify.c stunnel-5.43/src/verify.c
---- stunnel-5.43.orig/src/verify.c	2017-05-13 09:01:07.000000000 +0000
-+++ stunnel-5.43/src/verify.c	2017-11-06 13:46:56.317566128 +0000
-@@ -51,7 +51,7 @@
- NOEXPORT int verify_callback(int, X509_STORE_CTX *);
- NOEXPORT int verify_checks(CLI *, int, X509_STORE_CTX *);
- NOEXPORT int cert_check(CLI *, X509_STORE_CTX *, int);
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cert_check_subject(CLI *, X509_STORE_CTX *);
- #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
- NOEXPORT int cert_check_local(X509_STORE_CTX *);
-@@ -285,7 +285,7 @@
-     }
- 
-     if(depth==0) { /* additional peer certificate checks */
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-         if(!cert_check_subject(c, callback_ctx))
-             return 0; /* reject */
- #endif /* OPENSSL_VERSION_NUMBER>=0x10002000L */
-@@ -296,7 +296,7 @@
-     return 1; /* accept */
- }
- 
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cert_check_subject(CLI *c, X509_STORE_CTX *callback_ctx) {
-     X509 *cert=X509_STORE_CTX_get_current_cert(callback_ctx);
-     NAME_LIST *ptr;
-@@ -353,7 +353,7 @@
-     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
-     subject=X509_get_subject_name(cert);
- 
--#if OPENSSL_VERSION_NUMBER<0x10100006L
-+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
- #endif
-     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/files/stunnel-5.51-libressl.patch b/net-misc/stunnel/files/stunnel-5.51-libressl.patch
deleted file mode 100644
index 7ca8ace454d8..000000000000
--- a/net-misc/stunnel/files/stunnel-5.51-libressl.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff --git a/src/client.c b/src/client.c
-index b67544a..6676529 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -680,7 +680,7 @@ NOEXPORT void transfer(CLI *c) {
-         }
- 
-         /****************************** wait for an event */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         pending=SSL_pending(c->ssl) || SSL_has_pending(c->ssl);
- #else
-         pending=SSL_pending(c->ssl);
-diff --git a/src/ctx.c b/src/ctx.c
-index b3dc684..0186968 100644
---- a/src/ctx.c
-+++ b/src/ctx.c
-@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
- NOEXPORT int ui_retry();
- 
- /* session tickets */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int generate_session_ticket_cb(SSL *, void *);
- NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
-     const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
-@@ -125,7 +125,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, int, char *);
- 
- /**************************************** initialize section->ctx */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef long unsigned SSL_OPTIONS_TYPE;
- #else
- typedef long SSL_OPTIONS_TYPE;
-@@ -133,7 +133,7 @@ typedef long SSL_OPTIONS_TYPE;
- 
- int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
-     /* create TLS context */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     if(section->option.client)
-         section->ctx=SSL_CTX_new(TLS_client_method());
-     else /* server mode */
-@@ -229,7 +229,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
- #endif
- 
-     /* setup session tickets */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
-         decrypt_session_ticket_cb, NULL);
- #endif /* OpenSSL 1.1.1 or later */
-@@ -483,7 +483,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
- /**************************************** initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CONF_CTX *cctx;
-     NAME_LIST *curr;
-     char *cmd, *param;
-@@ -969,7 +969,7 @@ NOEXPORT int ui_retry() {
- 
- /**************************************** session tickets */
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
- typedef struct {
-     void *session_authenticated;
-@@ -1412,7 +1412,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
- 
-     c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
-     if(c) {
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
- #else
-         int state=SSL_get_state((SSL *)ssl);
-diff --git a/src/options.c b/src/options.c
-index c7bd5c5..5441b80 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -81,7 +81,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
- NOEXPORT void sni_free(SERVICE_OPTIONS *);
- #endif /* !defined(OPENSSL_NO_TLSEXT) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int str_to_proto_version(const char *);
- #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
- NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
-@@ -3098,7 +3098,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
-         break;
-     }
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
-     /* sslVersion */
-     switch(cmd) {
-@@ -3671,7 +3671,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
- 
- /**************************************** modern TLS version handling */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
- NOEXPORT int str_to_proto_version(const char *name) {
-     if(!strcasecmp(name, "all"))
-diff --git a/src/prototypes.h b/src/prototypes.h
-index 4a5d9af..057d3b9 100644
---- a/src/prototypes.h
-+++ b/src/prototypes.h
-@@ -226,7 +226,7 @@ typedef struct service_options_struct {
- #if OPENSSL_VERSION_NUMBER>=0x009080dfL
-     long unsigned ssl_options_clear;
- #endif /* OpenSSL 0.9.8m or later */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     int min_proto_version, max_proto_version;
- #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
-     SSL_METHOD *client_method, *server_method;
-@@ -666,7 +666,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
- #define USE_OS_THREADS
- #endif
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifdef USE_OS_THREADS
- 
-@@ -714,7 +714,7 @@ typedef enum {
- 
- extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */
- CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
- int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *);
-diff --git a/src/ssl.c b/src/ssl.c
-index 60e31c1..10b0658 100644
---- a/src/ssl.c
-+++ b/src/ssl.c
-@@ -39,7 +39,7 @@
- #include "prototypes.h"
- 
-     /* global OpenSSL initialization: compression, engine, entropy */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-     void *from_d, int idx, long argl, void *argp);
- #else
-@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
- #endif
- #endif
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-         void *from_d, int idx, long argl, void *argp) {
- #else
-@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */
- 
- #ifndef OPENSSL_NO_COMP
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- NOEXPORT int COMP_get_type(const COMP_METHOD *meth) {
-     return meth->type;
-diff --git a/src/sthreads.c b/src/sthreads.c
-index 37a1398..750e312 100644
---- a/src/sthreads.c
-+++ b/src/sthreads.c
-@@ -97,14 +97,16 @@ unsigned long stunnel_thread_id(void) {
- 
- #endif /* USE_WIN32 */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L
-+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \
-+    defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT void threadid_func(CRYPTO_THREADID *tid) {
-     CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id());
- }
- #endif
- 
- void thread_id_init(void) {
--#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L
-+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \
-+    defined(LIBRESSL_VERSION_NUMBER)
-     CRYPTO_THREADID_set_callback(threadid_func);
- #endif
- #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED)
-@@ -115,7 +117,7 @@ void thread_id_init(void) {
- /**************************************** locking */
- 
- /* we only need to initialize locking with OpenSSL older than 1.1.0 */
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifdef USE_PTHREAD
- 
-@@ -224,7 +226,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) {
- 
- CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifdef USE_OS_THREADS
- 
-@@ -334,7 +336,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) {
- 
- void locking_init(void) {
-     size_t i;
--#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
-+#if defined(USE_OS_THREADS) && \
-+    (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
-     size_t num;
- 
-     /* initialize the OpenSSL static locking */
-diff --git a/src/tls.c b/src/tls.c
-index 6c92b96..5e60a95 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -41,7 +41,7 @@
- volatile int tls_initialized=0;
- 
- NOEXPORT void tls_platform_init();
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT void free_function(void *);
- #endif
- 
-@@ -52,7 +52,7 @@ void tls_init() {
-     tls_platform_init();
-     tls_initialized=1;
-     ui_tls=tls_alloc(NULL, NULL, "ui");
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     CRYPTO_set_mem_functions(str_alloc_detached_debug,
-         str_realloc_detached_debug, str_free_debug);
- #else
-@@ -184,7 +184,7 @@ TLS_DATA *tls_get() {
- 
- /**************************************** OpenSSL allocator hook */
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT void free_function(void *ptr) {
-     /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */
-     /* unfortunately, OpenSSL provides no file:line information here */
-diff --git a/src/verify.c b/src/verify.c
-index acdfb5b..d7b7655 100644
---- a/src/verify.c
-+++ b/src/verify.c
-@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
-     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
-     subject=X509_get_subject_name(cert);
- 
--#if OPENSSL_VERSION_NUMBER<0x10100006L
-+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
- #endif
-     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/files/stunnel-5.54-libressl.patch b/net-misc/stunnel/files/stunnel-5.54-libressl.patch
deleted file mode 100644
index 1965f47bca2d..000000000000
--- a/net-misc/stunnel/files/stunnel-5.54-libressl.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-diff --git a/src/client.c b/src/client.c
-index 21fa273..e500d62 100644
---- a/src/client.c
-+++ b/src/client.c
-@@ -657,7 +657,7 @@ NOEXPORT void print_cipher(CLI *c) { /* print negotiated cipher */
- NOEXPORT void transfer(CLI *c) {
-     int timeout; /* s_poll_wait timeout in seconds */
-     int pending; /* either processed on unprocessed TLS data */
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     int has_pending=0, prev_has_pending;
- #endif
-     int watchdog=0; /* a counter to detect an infinite loop */
-@@ -705,7 +705,7 @@ NOEXPORT void transfer(CLI *c) {
- 
-         /****************************** wait for an event */
-         pending=SSL_pending(c->ssl);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         /* only attempt to process SSL_has_pending() data once */
-         prev_has_pending=has_pending;
-         has_pending=SSL_has_pending(c->ssl);
-@@ -1109,7 +1109,7 @@ NOEXPORT void transfer(CLI *c) {
-             s_log(LOG_ERR,
-                 "please report the problem to Michal.Trojnara@stunnel.org");
-             stunnel_info(LOG_ERR);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-             s_log(LOG_ERR, "protocol=%s, SSL_pending=%d, SSL_has_pending=%d",
-                 SSL_get_version(c->ssl),
-                 SSL_pending(c->ssl), SSL_has_pending(c->ssl));
-diff --git a/src/ctx.c b/src/ctx.c
-index 01119f3..b73fdcb 100644
---- a/src/ctx.c
-+++ b/src/ctx.c
-@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
- NOEXPORT int ui_retry();
- 
- /* session tickets */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int generate_session_ticket_cb(SSL *, void *);
- NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
-     const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
-@@ -130,7 +130,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, int, char *);
- 
- /**************************************** initialize section->ctx */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- typedef long unsigned SSL_OPTIONS_TYPE;
- #else
- typedef long SSL_OPTIONS_TYPE;
-@@ -138,7 +138,7 @@ typedef long SSL_OPTIONS_TYPE;
- 
- int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
-     /* create TLS context */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     if(section->option.client)
-         section->ctx=SSL_CTX_new(TLS_client_method());
-     else /* server mode */
-@@ -234,7 +234,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
- #endif
- 
-     /* setup session tickets */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
-         decrypt_session_ticket_cb, NULL);
- #endif /* OpenSSL 1.1.1 or later */
-@@ -493,7 +493,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
- /**************************************** initialize OpenSSL CONF */
- 
- NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
--#if OPENSSL_VERSION_NUMBER>=0x10002000L
-+#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
-     SSL_CONF_CTX *cctx;
-     NAME_LIST *curr;
-     char *cmd, *param;
-@@ -979,7 +979,7 @@ NOEXPORT int ui_retry() {
- 
- /**************************************** session tickets */
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
- typedef struct {
-     void *session_authenticated;
-@@ -1470,7 +1470,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
- 
-     c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
-     if(c) {
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-         OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
- #else
-         int state=SSL_get_state((SSL *)ssl);
-diff --git a/src/options.c b/src/options.c
-index 670adbe..a10cecd 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -81,7 +81,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
- NOEXPORT void sni_free(SERVICE_OPTIONS *);
- #endif /* !defined(OPENSSL_NO_TLSEXT) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int str_to_proto_version(const char *);
- #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
- NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
-@@ -96,7 +96,7 @@ NOEXPORT PSK_KEYS *psk_dup(PSK_KEYS *);
- NOEXPORT void psk_free(PSK_KEYS *);
- #endif /* !defined(OPENSSL_NO_PSK) */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10000000L
-+#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT TICKET_KEY *key_read(char *, char *);
- NOEXPORT TICKET_KEY *key_dup(TICKET_KEY *);
- NOEXPORT void key_free(TICKET_KEY *);
-@@ -3104,7 +3104,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
-         break;
-     }
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
-     /* sslVersion */
-     switch(cmd) {
-@@ -3273,7 +3273,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
-     }
- #endif
- 
--#if OPENSSL_VERSION_NUMBER>=0x10000000L
-+#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
-     /* ticketKeySecret */
-     switch(cmd) {
-@@ -3755,7 +3755,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
- 
- /**************************************** modern TLS version handling */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
- NOEXPORT int str_to_proto_version(const char *name) {
-     if(!strcasecmp(name, "all"))
-@@ -4079,7 +4079,7 @@ NOEXPORT void psk_free(PSK_KEYS *head) {
- 
- /**************************************** read ticket key */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10000000L
-+#if OPENSSL_VERSION_NUMBER>=0x10000000L && !defined(LIBRESSL_VERSION_NUMBER)
- 
- NOEXPORT TICKET_KEY *key_read(char *arg, char *option) {
-     char *key_str;
-diff --git a/src/prototypes.h b/src/prototypes.h
-index ebd413c..edd4341 100644
---- a/src/prototypes.h
-+++ b/src/prototypes.h
-@@ -244,7 +244,7 @@ typedef struct service_options_struct {
- #if OPENSSL_VERSION_NUMBER>=0x009080dfL
-     long unsigned ssl_options_clear;
- #endif /* OpenSSL 0.9.8m or later */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     int min_proto_version, max_proto_version;
- #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
-     SSL_METHOD *client_method, *server_method;
-@@ -706,7 +706,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
- extern CLI *thread_head;
- #endif
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifdef USE_OS_THREADS
- 
-@@ -755,7 +755,7 @@ typedef enum {
- 
- extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */
- CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
- int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *);
-diff --git a/src/ssl.c b/src/ssl.c
-index 60e31c1..10b0658 100644
---- a/src/ssl.c
-+++ b/src/ssl.c
-@@ -39,7 +39,7 @@
- #include "prototypes.h"
- 
-     /* global OpenSSL initialization: compression, engine, entropy */
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-     void *from_d, int idx, long argl, void *argp);
- #else
-@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
- #endif
- #endif
- 
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-         void *from_d, int idx, long argl, void *argp) {
- #else
-@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */
- 
- #ifndef OPENSSL_NO_COMP
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- NOEXPORT int COMP_get_type(const COMP_METHOD *meth) {
-     return meth->type;
-diff --git a/src/sthreads.c b/src/sthreads.c
-index dc2cd43..7a01f2e 100644
---- a/src/sthreads.c
-+++ b/src/sthreads.c
-@@ -102,14 +102,16 @@ unsigned long stunnel_thread_id(void) {
- 
- #endif /* USE_WIN32 */
- 
--#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L
-+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \
-+    defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT void threadid_func(CRYPTO_THREADID *tid) {
-     CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id());
- }
- #endif
- 
- void thread_id_init(void) {
--#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L
-+#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \
-+    defined(LIBRESSL_VERSION_NUMBER)
-     CRYPTO_THREADID_set_callback(threadid_func);
- #endif
- #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED)
-@@ -120,7 +122,7 @@ void thread_id_init(void) {
- /**************************************** locking */
- 
- /* we only need to initialize locking with OpenSSL older than 1.1.0 */
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifdef USE_PTHREAD
- 
-@@ -229,7 +231,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) {
- 
- CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
- 
--#if OPENSSL_VERSION_NUMBER<0x10100004L
-+#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
- 
- #ifdef USE_OS_THREADS
- 
-@@ -339,7 +341,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) {
- 
- void locking_init(void) {
-     size_t i;
--#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
-+#if defined(USE_OS_THREADS) && \
-+    (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
-     size_t num;
- 
-     /* initialize the OpenSSL static locking */
-diff --git a/src/tls.c b/src/tls.c
-index 6c92b96..5e60a95 100644
---- a/src/tls.c
-+++ b/src/tls.c
-@@ -41,7 +41,7 @@
- volatile int tls_initialized=0;
- 
- NOEXPORT void tls_platform_init();
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT void free_function(void *);
- #endif
- 
-@@ -52,7 +52,7 @@ void tls_init() {
-     tls_platform_init();
-     tls_initialized=1;
-     ui_tls=tls_alloc(NULL, NULL, "ui");
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-     CRYPTO_set_mem_functions(str_alloc_detached_debug,
-         str_realloc_detached_debug, str_free_debug);
- #else
-@@ -184,7 +184,7 @@ TLS_DATA *tls_get() {
- 
- /**************************************** OpenSSL allocator hook */
- 
--#if OPENSSL_VERSION_NUMBER<0x10100000L
-+#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- NOEXPORT void free_function(void *ptr) {
-     /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */
-     /* unfortunately, OpenSSL provides no file:line information here */
-diff --git a/src/verify.c b/src/verify.c
-index 1d1eccb..dfd9bff 100644
---- a/src/verify.c
-+++ b/src/verify.c
-@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
-     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
-     subject=X509_get_subject_name(cert);
- 
--#if OPENSSL_VERSION_NUMBER<0x10100006L
-+#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
- #endif
-     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/stunnel-5.56.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index 4ad962ee6aa9..667f8f567387 100644
--- a/net-misc/stunnel/stunnel-5.56.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit ssl-cert multilib systemd user
+inherit ssl-cert multilib systemd
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
 HOMEPAGE="http://www.stunnel.org/index.html"
@@ -22,17 +22,15 @@ IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=
 	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}
+RDEPEND="
+	acct-user/stunnel
+	acct-group/stunnel
+	${DEPEND}
 	stunnel3? ( dev-lang/perl )
 	selinux? ( sec-policy/selinux-stunnel )"
 
 RESTRICT="test"
 
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
 src_prepare() {
 	# Hack away generation of certificate
 	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
diff --git a/net-misc/stuntman/Manifest b/net-misc/stuntman/Manifest
index 9543dcd70dae..ceed8e14af8f 100644
--- a/net-misc/stuntman/Manifest
+++ b/net-misc/stuntman/Manifest
@@ -1,9 +1,5 @@
 AUX stuntman.confd 403 BLAKE2B 203ee17a4ae188486d8b8fc431d2cbf29eb821f5f2b0bff3dffa4854b4d2402c255561f18024041a2bb6fa1abe0797b9b3d1f0c7e125f5ccd910142525a63556 SHA512 eeb3d8cc7299cf0d42c5fc111207685bfd2e722dd4389f7fb37250313e9cf3c91d0037b19723bb1018a54daca677fe60f65aa8b5f7fff70e4f6325dc9b7e1e66
 AUX stuntman.initd 272 BLAKE2B 2be96dcc81b0681bba279341c5d25ea30b56e5698007d1dfa53c057ce5ed0a5ef1c53b0b34365a8c36160a59ebff3053b61e37d3598e2edbcdc9748b6761cebc SHA512 e8cb2d80573a57e582f4fd68f3772a93c74eb7abf96539acb1441eb1e94a6dcc7fad84f65d13d7ca7a4130801b69af9314fc78c4089c6d0f05a3b0366abedb18
 DIST stunserver-1.2.15.tgz 124675 BLAKE2B fc59a400dea30382aec80d6b634ed7c2a1823712788b7775c1bbf8511fa62173224084ae9b05a402e0efb11f0077087e515d9639eb9eec5d0ced48ce37c20cef SHA512 8af5341cd3a78bd3a68f75e2da1b6d5e75de94c9baa4f48824667e2c50f9b8323a60d33711c658c7e628e2a170cea7584e4d4012603736ad7140fe1a37ad9b66
-DIST stunserver-1.2.7.tgz 113853 BLAKE2B b4da41c46d2017da76b21544bae9eaba4deb25d50145829d92fa18fb8e2c5eec6b81c54a3c91f592686c73c0ef66dfde0e74fe34e82a1eac320455d0808eb7a6 SHA512 b6adc1b237e8717f296201bf865bea39c759b978db954cc15e37c3be7c2e109607273d96bb88c42654d0b843ca1a557874d02ab58e16506534db30f52d7e6f51
-DIST stunserver-1.2.9.tgz 116797 BLAKE2B 16a380c9dd002f9ededa5cc7ea757087b2c5199144c8b6cff2c429ce6f77741d7f18a1ed12e9035c1f77f7c1546adb95ceaad744780347f035a1b302637de442 SHA512 8e947dbe050f70e10615a23900dbd2151cd9fad36e343b4cf34c0b7a4e07debb8ced16fb7eac0469cd5ec3ef7a4c04cb9347f59c2a1326af3db400906198454f
 EBUILD stuntman-1.2.15.ebuild 658 BLAKE2B 85e189a811bbaadc35977214e4cd6241cc5fbc243b060ddddf3075424456aa69881ab5d41cfb4af07dbf9471e887caf8c948ef5cd0135adff3fe3b17c436f82f SHA512 24ce4620a1e0602276cfc8ee0f953330d11347cb7354bf67d8040d010989c2dd4bb2163bdff4ec4a11b23daa731d4de4f04370fa6b7361dc5a1d51a2b7f947fb
-EBUILD stuntman-1.2.7.ebuild 670 BLAKE2B 6b90a9d051b79b90696c09a1bf4043c970c66c9c37fa47f0e46a30c0a2ed8bb5b7426fe0ec9ac34a1e1c1f7d2030661818c2149ee460b0e3d283321f05824d24 SHA512 df2401d9d371e122ebdfb99c2e3d51473f85f2b4f117d24725f52dd7175b8964c75722a33d8a732bbfe23768a23c130c4cd1f61e71913e1a187af68def0eacd2
-EBUILD stuntman-1.2.9.ebuild 670 BLAKE2B 161b77e236403b796d6d23b45a509bd4dd52ab8e91ff9deee80f7b5b692388c664f772d19308c7eab5f2e48561aab3ef8c5e8b18a2ceab4b42ade45737f0358d SHA512 f8b38864ac8d046bd19599ed8970330eb0f5e9c4b2d5c42bf3c66bc0d33616ee4a8c96c428392bb56168321f84424135afeceb4c159842c65bab067cc37334ac
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-misc/stuntman/stuntman-1.2.7.ebuild b/net-misc/stuntman/stuntman-1.2.7.ebuild
deleted file mode 100644
index dfb40eb4a220..000000000000
--- a/net-misc/stuntman/stuntman-1.2.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="STUNTMAN is an open source implementation of the STUN protocol"
-HOMEPAGE="http://www.stunprotocol.org"
-SRC_URI="http://www.stunprotocol.org/stunserver-${PV}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/boost
-	dev-libs/openssl:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/stunserver"
-
-src_compile() {
-	emake T=""
-}
-
-src_install() {
-	dobin stunclient
-	dosbin stunserver
-	dodoc HISTORY README
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
-
-src_test() {
-	./stuntestcode
-}
diff --git a/net-misc/stuntman/stuntman-1.2.9.ebuild b/net-misc/stuntman/stuntman-1.2.9.ebuild
deleted file mode 100644
index d391ab7e5ef0..000000000000
--- a/net-misc/stuntman/stuntman-1.2.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="STUNTMAN is an open source implementation of the STUN protocol"
-HOMEPAGE="http://www.stunprotocol.org"
-SRC_URI="http://www.stunprotocol.org/stunserver-${PV}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/boost
-	dev-libs/openssl:0"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/stunserver"
-
-src_compile() {
-	emake T=""
-}
-
-src_install() {
-	dobin stunclient
-	dosbin stunserver
-	dodoc HISTORY README
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-}
-
-src_test() {
-	./stuntestcode
-}
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index ed50d45db241..26d18a47b18b 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,10 +1,6 @@
 AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc314ed206e5b5dd838e0ae7152a03417bb4b9044f544b8bf729421bb35f723bcb48ee2f58fcfaf27d460f51ed172d73 SHA512 5b748df7b50957746423954bea86b2ce43063b33a0e5ad3d22d93653c4e3dd11494111e46b4c83c45add41dc448c004ddc3b217be23712953682784c79f76564
-DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83a03041eddfcbad9baa7211776a7b68292109cccb2ec250952edb77eeca79143137eb8a94da8b774e952c3e5790c6231 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8
 DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
-DIST suite3270-3.6ga4-src.tgz 3288095 BLAKE2B 34245d6050f7d70ef6195dc669fea55eed70cb9b6c616a4bc88bc52bcfd9d837e527debc87eba4ccdc47c4a453e16749c23b9618d5bf4198e4131573f437209b SHA512 5309c4b4ad0d730033166b0bdb7638bba5fc00908776a229d5f0a131f72741897a0bf6b86dee3b1c9f3d480dc4f23e03e812d3349cec7094908c6a54a87d5ccb
 DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
-EBUILD suite3270-3.5_p10.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
 EBUILD suite3270-3.5_p12.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
-EBUILD suite3270-3.6_p4.ebuild 2116 BLAKE2B e37c59bc618a3b93f0bbea5514759b3b7de4abf77d6f0c5da239818260f7f95ece0240e5b4207e26b4f8dc5db78c0a80ccc7c4fc0787a76f72b04e9edf36f669 SHA512 d7a82a99a30fa7e142d3d5af95870242c8d15f5093145362ab81f023e67d6e8119d8b43e295188a4f5d7248679bf0276e2aafe0cdf3d83aa2c54678fc08c2f9c
-EBUILD suite3270-3.6_p8.ebuild 2131 BLAKE2B ce8b9914fd1a727ae89275f0e8b3c249e801acb57f81a500b4bbe3adb48e4305bfb6edc3c12d30ff182a292d2f509bc81c7977851db7abb2f6f0ff0d6019998e SHA512 9060597d86be01a6de0e2c1b06399cff3ff0a354caa9330710bd90c43ea4d09253fb47d7a2daca461ca1f4b7b1ae09f458e48848a4f4685cffeda1d7a03468bd
+EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B ee6028b2f735c8613a09fefb1adf341e901b7030b0a9008bed3687ecaf8335200d1750a7e34c62ceb99bdc8767f1895d8f1727f823abcede2f951c43a86a360f SHA512 339864c4e04fc6bfc30268810c139d56d6948f87c4128a069b6c3350f3c439c076f58045df3e9a1ae5c650cca5d7f76b9f8ac312cce3784ff6095d813f2e7768
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
deleted file mode 100644
index 887b8223af5c..000000000000
--- a/net-misc/suite3270/suite3270-3.5_p10.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}/${PN}-${SUB_PV}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S="${S}/${FONT_PN}"
-
-inherit eutils font
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXt
-	)
-	ncurses? (
-		sys-libs/ncurses:=
-		sys-libs/readline:0=
-	)
-	tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-misc/xbitmaps
-		app-text/rman
-		>=x11-apps/mkfontscale-1.2.0
-		x11-apps/bdftopcf
-	)"
-
-suite3270_makelist() {
-	echo pr3287 s3270 \
-		$(usex ncurses c3270 '') \
-		$(usex tcl tcl3270 '') \
-		$(usex X x3270 '')
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-
-	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
-	# (they have the same contents).  Wrap that in a retry to avoid errors.
-	cat <<-EOF > _install
-	#!/bin/sh
-	for n in 1 2 3 4 5; do
-		install "\$@" && exit
-		echo "retrying ..."
-	done
-	exit 1
-	EOF
-	chmod a+rx _install
-	# Can't use the $INSTALL var as top level configure also uses it.
-	# https://sourceforge.net/p/x3270/bugs/15/
-	export ac_cv_path_install="${S}/_install"
-}
-
-src_configure() {
-	echo "${INSTALL}"
-	econf \
-		--cache-file="${S}"/config.cache \
-		--enable-s3270 \
-		--enable-pr3287 \
-		$(use_enable ncurses c3270) \
-		$(use_enable tcl tcl3270) \
-		$(use_enable X x3270) \
-		$(use_with X x) \
-		$(use_with X fontdir "${FONTDIR}")
-}
-
-src_install() {
-	use X && dodir "${FONTDIR}"
-	emake DESTDIR="${D}" install{,.man}
-
-	local p
-	for p in $(suite3270_makelist) ; do
-		cd "${S}/${p}"
-		docinto ${p}
-		dodoc README*
-		use doc && dohtml html/*
-	done
-
-	use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild
deleted file mode 100644
index 3b9de305c879..000000000000
--- a/net-misc/suite3270/suite3270-3.6_p4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PV=${PV/_p/ga}
-MY_P=${PN}-${MY_PV}
-SUB_PV=${PV:0:3}
-
-S=${WORKDIR}/${PN}-${SUB_PV}
-
-# only the x3270 package installs fonts
-FONT_PN="x3270"
-FONT_S="${S}/${FONT_PN}"
-
-inherit eutils font
-
-DESCRIPTION="Complete 3270 access package"
-HOMEPAGE="http://x3270.bgp.nu/"
-SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
-IUSE="cjk doc ncurses ssl tcl X"
-
-RDEPEND="ssl? ( dev-libs/openssl:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXt
-	)
-	ncurses? (
-		sys-libs/ncurses:=
-		sys-libs/readline:0=
-	)
-	tcl? ( dev-lang/tcl:0 )"
-DEPEND="${RDEPEND}
-	X? (
-		x11-base/xorg-proto
-		x11-misc/xbitmaps
-		app-text/rman
-		>=x11-apps/mkfontscale-1.2.0
-		x11-apps/bdftopcf
-	)"
-
-suite3270_makelist() {
-	echo pr3287 s3270 \
-		$(usex ncurses c3270 '') \
-		$(usex tcl tcl3270 '') \
-		$(usex X x3270 '')
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
-
-	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
-	# (they have the same contents).  Wrap that in a retry to avoid errors.
-	cat <<-EOF > _install
-	#!/bin/sh
-	for n in 1 2 3 4 5; do
-		install "\$@" && exit
-		echo "retrying ..."
-	done
-	exit 1
-	EOF
-	chmod a+rx _install
-	# Can't use the $INSTALL var as top level configure also uses it.
-	# https://sourceforge.net/p/x3270/bugs/15/
-	export ac_cv_path_install="${S}/_install"
-}
-
-src_configure() {
-	echo "${INSTALL}"
-	econf \
-		--cache-file="${S}"/config.cache \
-		--enable-s3270 \
-		--enable-pr3287 \
-		$(use_enable ncurses c3270) \
-		$(use_enable tcl tcl3270) \
-		$(use_enable X x3270) \
-		$(use_with X x) \
-		$(use_with X fontdir "${FONTDIR}")
-}
-
-src_install() {
-	use X && dodir "${FONTDIR}"
-	emake DESTDIR="${D}" install{,.man}
-
-	local p
-	for p in $(suite3270_makelist) ; do
-		cd "${S}/${p}"
-		docinto ${p}
-		dodoc README*
-		use doc && dohtml html/*
-	done
-
-	use X && font_src_install
-}
-
-pkg_postinst() { use X && font_pkg_postinst ; }
-pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index f81e1979db33..bcd2a887e4b8 100644
--- a/net-misc/suite3270/suite3270-3.6_p8.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/tcpsound/Manifest b/net-misc/tcpsound/Manifest
index a1708943b12e..1aa4bf975b4e 100644
--- a/net-misc/tcpsound/Manifest
+++ b/net-misc/tcpsound/Manifest
@@ -1,5 +1,5 @@
 AUX tcpsound-0.3.1-makefile.patch 1573 BLAKE2B ea791c209bb065da0185451fd463d47ed9bde74d9bd03312853baaf129ad37cff0eab6b9ecd67700c49439a08588a2c25e62a8e3b6b7494acde740603a472c7d SHA512 6ae771f09bebdf265ca8e4b7efb0201140088f76dbfc13187b362641c2eea033d4b4a1f9a58661bd6c678d86bf54740dad0b101700f546a56ae5a0801b58fbd0
 AUX tcpsound-0.3.1-misc.patch 983 BLAKE2B 33edb9a8322698f9da2c3cefcd96b510595552c010c406705a707577433ecc42e7f50818467ec5df38f79014a7d95300cc1dc9ba3b67caf8b64e834451a1ea31 SHA512 48c37a7adba42c1a6279616ac05fa48794ad2ef2c5d810ca6866f74dedbc3b242841ef169007e0779e10f5db19bf1ae90fe87b595c543e34cb09998a84fc3156
 DIST tcpsound-0.3.1.tar.gz 155357 BLAKE2B ccab12232eb5b63c9baaffd866f3755cd7f8c0b71edff7508a0e823d805bc22d908d32eb48e1501870c4c3309be3a7b3ae029516848bf6decff4bcc6b5b53f8e SHA512 9db7c03f57f0e95b5b6b947bdeff9664dda6f6039e1080611205ca15648cb9b31325f462b31cbb1462a4aa767a9c89d6125c17144bb0dd7d0acf89e24b2f3055
-EBUILD tcpsound-0.3.1-r1.ebuild 604 BLAKE2B 6ad729a3163c930f6e10b0789ade7294ac25e13a8ff86964ede534ef1a8200261a64587a90acd5db8e40c2ee187f2d253015fbecfc9498cc73901aa123e5caa9 SHA512 b2e9676da6c845170351aad0da754a5ff416e3f9945a1c3cca733a52beb60040064680860c54db396eb48211eb9a007a6318d54a4616303fe9542644928f0eee
+EBUILD tcpsound-0.3.1-r1.ebuild 633 BLAKE2B de546db8bc7d00b933ba0572350d0d2250a25a8a3753e3b036bf0d4a530059df7dabbafe07601ef5a1c457d5820a5e9faf25b4687f784b86c088673cb8ee7c1b SHA512 01066de8eeaaf66c26b92b983a919c369c0737e284d2f54ea908ed916d7ea19003e20c079df28293531fd093801a9eb6e30f1fdc76ab5203d9dcc458666e2413
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
index f419b5a4eb9d..d21ae64313f4 100644
--- a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
+++ b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 DESCRIPTION="Play sounds in response to network traffic"
 LICENSE="BSD"
 HOMEPAGE="http://www.ioplex.com/~miallen/tcpsound/"
-SRC_URI="${HOMEPAGE}dl/${P}.tar.gz"
+SRC_URI="http://www.ioplex.com/~miallen/tcpsound/dl/${P}.tar.gz"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index c66be05c66a9..9956ddda388a 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,12 +1,8 @@
-AUX teamviewerd14.init 282 BLAKE2B af900eacf64f57d6c3a404cde9b42d4e45037c7bf8d5466422ebfddbce4fc1eb27c3982dd81d4bb918479b8da00104cd1b761e64738d00e70efb3b1d7fe2134e SHA512 0905da2033afbf2f4464fae31f7d22b87469c584b912d2f8b652d05a1f2a63709e87d0e70cb981cb87803e9d66f25c399f13eea0ecd0e665bd0a9c1f6994c3f1
 AUX teamviewerd15.init 282 BLAKE2B eaa5844606cab7942d8117a7f62687f1ba2b3ff5deecf61903d9c01ea5434c8104eceb2e50d1c7a4b93089df53c98fab38da6e6e5f4ee8c18426a7165b9cc465 SHA512 bc2271c1fb360129bf0452950340389e434e420830d7d3f47dcd248151dbbadf798c025d4e47fe311857c070f3dd7b12f0092fa09508f0300963c6e04d8ed7c8
-DIST teamviewer_14.6.2452_amd64.tar.xz 12507160 BLAKE2B b84f085f3371877952680305808ae1201330a6402fb0e6e4812978801b8e888b6166a8f9f39bcea16ce60e2df039fdee6800a32612028f6d8237dd763f87383e SHA512 7d82356df572e19ffc1de6de5b94f1e95e511f986c4aa88ff2a80dc6dfd12c798f93e62d7886c66c57c51a432fd265cfadaf267a56dbccb029207e3ebd719c30
-DIST teamviewer_14.6.2452_i386.tar.xz 13055508 BLAKE2B b2adc4c98aecae2886a9fc51bdb9e233250985b7863ebc4376d7d0e8240e8ed2eafc878a9a522a2d5c2c0493b4e483cd70b2ea14f57c13892635f7756f398cd8 SHA512 0ed6d712c3df7ac13748f013bb9ad27d57dda0f0f5e29847a12529253e619a47c05806a209a3e20e7760f59c9feba5bb9d33de0a739adc6619a8e6e52dcec86d
-DIST teamviewer_14.7.1965_amd64.tar.xz 12459308 BLAKE2B 4a4b8005220f5433458ac61d3b9cb483d275ffc617328c49a0c7000f19b46dd620d3e517c80a680ab6c29a24924c436853d894dd6940a924afe5db848dcadc03 SHA512 b5d18bec8a5584d23687bc9f57bb8e7c44218ec9cb8adef274c9c9580bbcde51aa63d8a72d0755f1cca61305d535d20994b3a263233aca67a844b7ae6da42fcd
-DIST teamviewer_14.7.1965_i386.tar.xz 12958172 BLAKE2B bb5d66a2ec3d456b62d540217b9f6c798005419a0a14671968d47efc67532da844813af72cede8ca1c66e547af92b0af2acf2a85712a9f008fc0adfc01251632 SHA512 43ac26e851ba1018de61b20f7e8a6849e3141ecee809efd44f47cda080150aac9d1cd4fdbc911292c7d543c37830922f67bd1416ebe5c4603a07ffcaa30de517
 DIST teamviewer_15.0.8397_amd64.tar.xz 12532076 BLAKE2B a66cc74961edb1eb28b38a77aa29a18c91c86703334903f33e6a7d9cd4dcedcfd92d51636c2908eaa38ff0f024eca97f8b1ad63c396f033efa5039b9fccff5a9 SHA512 f4c9fb9da1b7af9fa1d798c67eb014e906684dab05b41d5618ec21732a4b9b917e7d51e185ca58bc811c8e869f7171136e5a405f9ffd7e8fa5d0b2c7952ed68a
 DIST teamviewer_15.0.8397_i386.tar.xz 13019240 BLAKE2B b14dc20b31d888297602baae65c9ec802e5104f8169090ca3f88b87814f58b81585b9d5b89bfe8478d767b30612ad05ccf2d6a659046c0c5e75bfa287436e06c SHA512 4e1d6101ae8a91e03c6580407857df76505dd216baf172de6a7d00ea308318b8b326f0d15e1d8819ede4d7d758c65608c4446abcfc52ba224e56ab11a623aa65
-EBUILD teamviewer-14.6.2452.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
-EBUILD teamviewer-14.7.1965.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
-EBUILD teamviewer-15.0.8397.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
+DIST teamviewer_15.1.3937_amd64.tar.xz 12898448 BLAKE2B fea1d64c04c5c4f04237ab639b1faf1c6fb027fa5f4824f8a9c0ed31b52894c7a22130d0871dba98388ccf073a5393973350a3e3ea88f94bc5958196a6bb8934 SHA512 23fc65a676570c291184a5c89ce05998cb70ec822d764264de7afaffa47a862e3eb0a4ae9364064fa831165be901dc0b85cb5b79181b8b833638d720504dee5c
+DIST teamviewer_15.1.3937_i386.tar.xz 13443796 BLAKE2B aa9c5f3cd42a123c38a567a117c919c829e089e4c81cf4b6fca0559351895c3824b7a117ac7dc64c9f1129e0cd44dd2347e57644080559a86640a9d8bffbe62a SHA512 8054e5e3901d60bbf210b03209da8afaab03ba95529d1a107a23401a7561c5ee0c33a43837f84490667f0fa282fe8a74087473b7f51f604b675e87d87522302d
+EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
+EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/files/teamviewerd14.init b/net-misc/teamviewer/files/teamviewerd14.init
deleted file mode 100644
index fc793766abd3..000000000000
--- a/net-misc/teamviewer/files/teamviewerd14.init
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/opt/teamviewer14/tv_bin/teamviewerd"
-command_args="-d"
-description="Starts the TeamViewer remote control daemon"
-pidfile="/var/run/teamviewerd.pid"
diff --git a/net-misc/teamviewer/teamviewer-14.7.1965.ebuild b/net-misc/teamviewer/teamviewer-14.7.1965.ebuild
deleted file mode 100644
index 6650185440e6..000000000000
--- a/net-misc/teamviewer/teamviewer-14.7.1965.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-15.0.8397.ebuild b/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
index 6650185440e6..7c717766d4a1 100644
--- a/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${
 		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
 
 LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
+SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
@@ -70,7 +70,7 @@ src_install() {
 	done
 
 	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
 	systemd_dounit tv_bin/script/teamviewerd.service
 
 	insinto /usr/share/dbus-1/services
diff --git a/net-misc/teamviewer/teamviewer-14.6.2452.ebuild b/net-misc/teamviewer/teamviewer-15.1.3937.ebuild
index 6650185440e6..7c717766d4a1 100644
--- a/net-misc/teamviewer/teamviewer-14.6.2452.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.1.3937.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${
 		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
 
 LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
+SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
@@ -70,7 +70,7 @@ src_install() {
 	done
 
 	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
 	systemd_dounit tv_bin/script/teamviewerd.service
 
 	insinto /usr/share/dbus-1/services
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 7d99bf4e28ae..c781b7358097 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -1,6 +1,6 @@
 DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
 DIST trackma-0.8.2.tar.gz 171917 BLAKE2B 9fedd04036d55ef8fa748e64a18a2d471cab61b71030840baf18252cb81d2ad3df72eba6d417484c2772cb81d3e0e6e2311440c77040a899152681e427408a7a SHA512 6063f65fa70ee65f3b30cd2750bc1f501a6a94dc796195f11d89f4430cdae830fc5987bf6d261c77603c9cc5d32f80286aeecc05d44f766ca705e932997d46f1
-EBUILD trackma-0.7.4-r1.ebuild 1952 BLAKE2B 0fb31b5b5df5c325d814989564cea1d512a16e1abfdf44f16a5c659974241de3f4d73466a7d29bf268998f624f04e46f8fa44e5eca7d37241c735cbbf9520a80 SHA512 d66b70dc4921f7aa49da208007b7b16e976d5dad645d842ff9f9f60388df5ecdb454258255880e69bd1a2bb8e52d909354bb88ba985e5b212bf7f186a9b9e7b0
-EBUILD trackma-0.8.2.ebuild 1951 BLAKE2B 86d80e7d059663f486429987fff04e60300989d38280d8769c2301b36fd4d7c3232e8244695ace0c87f8d490dead736da1d36075d37105539b514543343c7648 SHA512 c3a82e80395355d983f2999299c51d4579b1c53fefe5c0aae6984606405480c292625e0919e26abd61aa8c5942eabbe90bd8a449a5505222379153c88ac2a4ab
-EBUILD trackma-9999.ebuild 1904 BLAKE2B f5d0a6e16959af610bf104fbb826eee29b94c0be08639a7c8891bec52ad9ac35dd411e48e3cfa9ebbbddbb67b1738e130d6f7af4bb94c2bafb8cbe03d4cf6c80 SHA512 898f27b9bd97236b50454148a2f8ed4af3071bee185f4471fca5f25668ee3d430d8998fb2481d1de8ecc759f3e7475eebfe0453e28d05b3e8a3d2d88d6a7c579
+EBUILD trackma-0.7.4-r1.ebuild 1946 BLAKE2B 747c2e436a4488088d0b54a7c02d235eb29e4b906ceb9fdb3add5b44a8ecad2f875005e06d8b94791190b5caf9b647b834bd92a0833b2d41ffd201978c2a468a SHA512 792d5f2ede9f85ead17025ace37e7812fb996d02c72708486e3032ee7237333dbeeb005457ca6709bd87ad2f34a4c519a178762808945e34ba793ec4e78eeebb
+EBUILD trackma-0.8.2.ebuild 1945 BLAKE2B 2a269c6b0446b30a7a99db1048ded5554cc5f1745df8cd6c4e71d126b3fc3bc555a301d2612e95213e96f2cda40707e10e4017c8ee35f1385c6a07a39ae94124 SHA512 6eb5d08f5dea23506767d0dcb1440ee9deff15d19e88819b77b0a2c695058d22644df832d124445d431548cff9c96c0cadbe98e970522db884a83afe98e953da
+EBUILD trackma-9999.ebuild 1898 BLAKE2B 52dc023f0eb31a1354e7eab976ea223c5ed8288e7597e384a40a84d06df32cb98f0451dd16a62cdd4c95ba55a707b22a0cee23b531ed0da3484c27c3cb2bb0a0 SHA512 b8a17e6ba208a17042780333d7c56922862f61022afc46b2d4d0c81957c8d171d621c7d39760018d23620a740ef78f1c45b151ce6ec484a2014955cdeb2b2952
 MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/trackma-0.7.4-r1.ebuild b/net-misc/trackma/trackma-0.7.4-r1.ebuild
index 5c7cd0c57569..3cf1a43582fb 100644
--- a/net-misc/trackma/trackma-0.7.4-r1.ebuild
+++ b/net-misc/trackma/trackma-0.7.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/net-misc/trackma/trackma-0.8.2.ebuild b/net-misc/trackma/trackma-0.8.2.ebuild
index fc1e2899065b..e632d4103918 100644
--- a/net-misc/trackma/trackma-0.8.2.ebuild
+++ b/net-misc/trackma/trackma-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/net-misc/trackma/trackma-9999.ebuild b/net-misc/trackma/trackma-9999.ebuild
index aed3ebbc8ef5..6d746c2385f4 100644
--- a/net-misc/trackma/trackma-9999.ebuild
+++ b/net-misc/trackma/trackma-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils git-r3
 
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 6f9f0a216f08..c395a64f6e41 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -6,6 +6,6 @@ DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
 EBUILD unison-2.48.4-r1.ebuild 2447 BLAKE2B 5024275888237d751a662dab1359b472f4567687d5149b08a473fd83fc6bd8d7a606e19a88c69a4e0a56e83ca870b410e7ad9666d6e1f0fe5b4b3fb13f684684 SHA512 12ea4b576bf8cc91ffb2cb31b3f7994e7271b13d23ace19901478ce6ec8df38abeae5548b9941c83526e298a00e53916478d646b4a3ac6616af249c5f1cbc928
-EBUILD unison-2.48.4.ebuild 2339 BLAKE2B c872c4f22d286f150cca2032130d8d48634f0174a073bb30c735a73724fba192201ccc6433993d18b0c8b972fc36759054647d9a662eb3af61847b1fabb0964e SHA512 f3fc19ba27f706ac34d718b8228f0a187a347783e18173eb4170ebce78fb22ab02191386132ef7f825d914f3396676f847b011a0d076a8ce6f804a4df2acf2b8
+EBUILD unison-2.48.4.ebuild 2352 BLAKE2B 28b7cc3e9065028405b3d67586b406b4c66c4096d6d78bbb29c170f78a60c6436069252685108c2851c2d2b5a6d67b79fbad04ec64c8665902812297bb585625 SHA512 ade4c06bdb083b228b759b20db68653e9fa05ba29caa890e505750ae2ba203405981fa5ba048e5b860b9a8ee8816e38354643a7586719f110071cd0f260bea37
 EBUILD unison-2.51.2.ebuild 2162 BLAKE2B 13c270c67910618a119ecdf9c3779c1175b64ab2bc17de2735413120404a7784ff8de8e8b9e48c3b91bed3b5e7aa0e84370a159ce10b5753c28ddff63e4804da SHA512 847b543b1e83d1036e57c4580103ba4c3c0f31c080c8dea96e3261ad87b06bff0a8269a5f861ec559e9e41f977de5ea9f9825aef62e69bd3f666f1b2aa2fd7bd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index fb513a40f2e3..e2ba50d54f28 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~spa
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
 	gtk? ( dev-ml/lablgtk )
-	test? ( || ( dev-util/ctags virtual/emacs ) )"
+	test? ( || ( dev-util/ctags >=app-editors/emacs-23.1:* ) )"
 
 RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 13ff3d579d5a..9071c361cc16 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,4 @@
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
-EBUILD wget-1.20.3-r1.ebuild 3219 BLAKE2B ed62068ae8d769c614ddd05ae6904bf02b94eb0e6783ce03e6bd70199ea3ca0a3139dc4cdd2840a1e314950499db00398c09b01f9f3d8e77f28352618b78859a SHA512 ea9506291f2c2ee7964bae9d716862334b2cf3eff5b80dc1410ea4d8a90e809daaa6cb04b3c7990986048f0205858cddc0ccab017998a7d94f8f1a7e6e3a98e8
-EBUILD wget-1.20.3-r3.ebuild 3369 BLAKE2B 1067e0773119113426771b55d68664749fbc6cdc0df105656d8ed1f29dd22ee79dbf67176b7c76e4a8fcf86dd93ad84e591b821c8ab47586382ae095df331d2e SHA512 6c8b38e33a902b837419ac3fe4c190b09c5d5f855b74d7a739883b9f9d3be0404ac8112847dbb43c5043e94038b312df3c5cf16625c5da64550ff039c16d7ae1
+EBUILD wget-1.20.3-r1.ebuild 3217 BLAKE2B cd754924646ac2d5f4416953126dc23e1d8aaa01e712b6d4712954c5dcd278578e68eda8680ba26deb137be12806ec936e17711e06234b4fe7152bc02b424daf SHA512 5c1775cd58c0066fe6d2042cf09ef443d2f8e05f40c324c582a58a0297596a2b3f83aefe8f58266c380b48db645196bd8e1e530de78d21508f5103f643884575
+EBUILD wget-1.20.3-r3.ebuild 3367 BLAKE2B 81111c074f50ae7c8e576a5c32f60cc5594c7fea06fd9c93ecee06ca5ea3e339ad8f5743df1912adc1b3407a909a116f7f0d2edc02ee3ddd52a254c832608bba SHA512 6d58d28d41396bd27efaa9288c91b944dcd150d67228a074eb0a1164f1a6bf2633127c7a934747f81bdd374bd669ef2993ab88e9437549f8cf1b35f92428bf2c
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild
index 7d72a792dcb9..305fbdd92177 100644
--- a/net-misc/wget/wget-1.20.3-r1.ebuild
+++ b/net-misc/wget/wget-1.20.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 9b186d6be020..00bf74f0865b 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 8d8a4a6264c6..8b3913afd322 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,10 +1,10 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
-DIST whois-5.5.2.tar.gz 103312 BLAKE2B a1b5c7ad0147dd5b9a63deed9433f31f46f141af88673e858f7316bd6ea72c632c9c804fc0691faabb992bf525d29e6c1e0106f98b6457933adab87d94f51a2d SHA512 39cb2a8eb105096d8905d9509b86750e4850808e74d5a3640c0e57185255e2ae18b322b7cfe98f2e00ad13638e5403d93c78280b0ae2477e6e7ae8a0f0b8c234
+DIST whois-5.5.4.tar.gz 103246 BLAKE2B 2faf638f45d57c3f19845c37bfee061c2586121a4bb5e1f4b37c23dbe08ef0642db7cc58c14dea8edbbbb8de91cfbfaf72d1901c19a2bd3ca19f6838e3500362 SHA512 f2fa92dc9490356c3584c2f9ac4e443dd4f57fbbeb0499fefc80af62665b886cb19d33ca55c5a8a0f9378588a646dfbd4dfda4da6c55681ba974b49ed93208d7
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 DIST whois_5.5.3.tar.xz 85456 BLAKE2B fb64150ef2a3c40c7e9b7467198f1187b07d7b0a75e7f89f36a613cd9480016434a187607f93c102142f2f82cba405f5b0a7b16314f1b13aea793da6eb3b9ade SHA512 cf92c17b9187da1fb5ef38d3e814cb5590fc9bcb5c8f53640428cb7680fd003ce71d8a6819279b571138da1b31042b65eb1dac5d3b220ab725d191958c4ba47b
 EBUILD whois-5.4.3.ebuild 1573 BLAKE2B 9308d736931da85ca666b44725576371eba07b91e8db65c22e1ff5394b5a09cff13b25c856fd2b7e53c57cb7a1a2263d3ee5b865f4432749c7ace193e375ab00 SHA512 be379cd50b6b169809d04e451420068802cfbd5ab2821f353ce318cf94b03217f5e072118153a6d516b30c4427e2d6ba041f6ccdd88bcee7e1945d91412de6c0
-EBUILD whois-5.5.2.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 EBUILD whois-5.5.3.ebuild 1802 BLAKE2B 279625a4d204dc2544fcb48101184872927bc62b006f3fc6dd95741849cd83ceafa61c8df9b9eff12e9335944de820762c3ac267bcb7fbf796cbb4f14c9f8c67 SHA512 2ce870c80ec1cef69657609b0bcbd930d290506a631a157cfee5f58921caff808d4561a4ea2e560117cfe14b6bfa49aba18e03c991c5e1f07f38d46a6c609196
+EBUILD whois-5.5.4.ebuild 1803 BLAKE2B 18abf8ebc9dc0b9e47d911344cd64876aae9bd0c88a22bc40489759824116c42510e65c1f698513ecdf048eef7bb58a841e949083aaae55b4adae1dfd9ddf268 SHA512 c8ea7771d38c1e138899fbf1859d33b8fa2d448306403ad2561c940b4dfefbb20dd2555ed38780187beec2ead11c6e118e87aee01aa667e5cada372610cee3bc
 EBUILD whois-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.5.2.ebuild b/net-misc/whois/whois-5.5.4.ebuild
index 8b649d81bce7..5c2065a97ce5 100644
--- a/net-misc/whois/whois-5.5.2.ebuild
+++ b/net-misc/whois/whois-5.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,8 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+#S="${WORKDIR}/${PN}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
 	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index 71dc7ba6782a..95fddd2a1d15 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
-EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 970 BLAKE2B 6617544904d75e0b01fb85dc68001529ba86792f39771ddca1b20255b40b48fbaff6f2d3e5570ebf827a55f23eb9409b5a550cdfe0e52e897e19ec66994da16d SHA512 3cf54cba8398aa8d12f7717c3cb33c6dc630284c5b442e913a8f8b5de34ef6124c6610fca0ff5194d0191735fc310fac54b4e4115268bc4af912ca1f44c79fba
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 977 BLAKE2B a1d884321ce2523f9c349f9b64ab331bc5be74651ea14cf9abfdaa8ee377eefa10e6b07fa77ac5f10c995f084fde0caaba28642ee693a5f4b7f5f80f1eccb969 SHA512 1bb2f30f9eac3b084cae1f472700be1eca9a36710764358dad2e6e2b8ca6c5066d4fe2e5d9f0c24c9113c8e3765b5365766aebec936d29d0fe4bb6c0109e3306
 MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
index 39a9265be13c..170cf0ede390 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/ssh
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index e1c600cbf931..53e5d8d68e64 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -5,5 +5,6 @@ AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f
 DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672
 DIST x2goserver-4.1.0.3.tar.gz 141581 BLAKE2B 79401a146e8a18451d6521f4b9556b2f22746bd752f39dc45764bacca085f2bb66a92327aaeb292979ce43ffbde24541e492cec814f1f8a535614cbdc2dc3ebd SHA512 9d7257dd454bfedca9e3ef1b07bc38b540cb833fae4535f2225a1f0bfea93c0f04c638d411b57c50e7170106a5ae1d7f41c19f043832129a7a9460dcfd34c56a
 EBUILD x2goserver-4.1.0.2.ebuild 2603 BLAKE2B 6d7c418547ce8ebeb4c226e1e90d18d329bfd679c8fe6c09d6fa967e0ffeb89d04257154e192d3e7a8585443ad8818730e0a490074ba9e0b4bf05bee50df53df SHA512 2b918aa2920ce522d89657cd297a9dc40e6cff579cd700d338c9957c23cf9ca57855a8b6fd806054905a4636bd27591afa5348787dd568e02c68e5a298c6917e
+EBUILD x2goserver-4.1.0.3-r1.ebuild 2536 BLAKE2B 42a7874b734b197bd40afe674fbb09466449324a32954a6b87c737d1a27c3cdcde3df39be206b4ae1abdafc0dcb2f042a3673f7a683f8d1aee561e4813cba49a SHA512 48a87eda1e576821193059d52627a9936e4487def7c6279b8ad23ab4d4e8e79235d110a0cc28d005d5bda333fbb4e200e5439bc9a29d42d5403a319f18a44aff
 EBUILD x2goserver-4.1.0.3.ebuild 2700 BLAKE2B fb10e4e31f889a17ddf491ec3b156cec3b5d34a72b141177597a2815ffefbc07519f86de5fbf1ac4883173826c7bb2d27d8461ebb2e5e13ca0ec7f7aa6bf9f44 SHA512 c721b7bb63e22a3bebf746ebe9aad94dab2d0ef888b4cc1b860e130385e27948f23f0b5f586def00a97dc0842d0725ccb13bf820f7afef06b1b90ca33d88a796
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
new file mode 100644
index 000000000000..dd16386ea11f
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd toolchain-funcs xdg
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+RDEPEND="acct-user/x2gouser
+	acct-user/x2goprint
+	dev-lang/perl:=
+	dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	dev-perl/Switch
+	dev-perl/Try-Tiny
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.99.14
+	net-misc/openssh
+	>=sys-apps/iproute2-4.3.0
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( net-fs/sshfs )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
+	"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
+	)
+
+src_prepare() {
+	default
+	# Multilib clean
+	sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i */Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDIR="/usr/$(get_libdir)/x2go" \
+		PREFIX=/usr
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="/usr/$(get_libdir)/x2go" \
+		NXLIBDIR="/usr/$(get_libdir)/nx" \
+		PREFIX=/usr \
+		install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym ../../usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use sqlite ; then
+		if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
+			elog "To use sqlite and update your existing database, run:"
+			elog " # x2godbadmin --updatedb"
+		else
+			elog "To use sqlite and create the initial database, run:"
+			elog " # x2godbadmin --createdb"
+		fi
+
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL database, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index e822fa0a4e3b..7ee897cab4b2 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,7 +1,7 @@
 DIST you-get-0.4.1270.tar.gz 143127 BLAKE2B 2c18a97001caf0c44a5baf30042cde61ac0ad2e8a5d0c0dc178474ba9cb70671c4bc9ecbbb72515f4fec2306598ba1b42d66192f2a16aa8fd0d65ff47eeb0b61 SHA512 fc21563396d73b0fbd7ff02c423a256be548957ef5d72277c887d33ee05269c2aa404a66972e934d4f0076ebd30bfa1b0914b05c25b38b63b3701dad1361587b
 DIST you-get-0.4.1355.tar.gz 143921 BLAKE2B da303fbcedd0818d785f846da4022364c3782d74b50f01b8aa2c0da38f4d61108da22a991e3ae02660021df6ee3378fb9e03826210563aee37e7f85e72b52fa1 SHA512 20f092d49e554f994b57dec4f12a8a0f4aaf418f8e0ce68611e1424f5ee512cad104c5498fe7d133ae8fa1c65440fdbebb8d523d9792336ea5c62ac3a58aa9ba
 DIST you-get-0.4.536.tar.gz 104745 BLAKE2B 48a5432ae1d4448ce0dcbbfdf52225920eb8cd8e575030cc62da0637f10cc7bb02a983c27c5bdd4a9fac1b45ab129db4f7fcc2ebb4bd17189918e04dabae0cfd SHA512 13d280dd5f0e6b6b5033de6eb94a251007bfc21bd99a9c0af86a5ed7b1c9b267d742c278dd80ec0a13445e09f2e22aea23bc77a5da12557be33f97731258abc6
-EBUILD you-get-0.4.1270.ebuild 487 BLAKE2B 6c58374899f3a47ff69bc7a444b7776f5e5ef022d930c31b4aec49e8e05c6c52e9e2831ac825d5819394b5c449ada1fe408ba889c5676d1736970a3afdf4c17f SHA512 071fb6d7f9730196f24506fa810ca22cb80f5c029732cc5111f60c9d24235b868b20d1e7f97d5ee303247b8b35c1fa5eaf87f2b726fa7d35b1e53d08217b5f69
-EBUILD you-get-0.4.1355.ebuild 491 BLAKE2B df2c52667746888d5d237efd9709fb6f906fd134e1f5577b49a2da44c6f758ae18adfed916a05ada93961b843155daeefbd0d7d097472f0a9aaece057fe88849 SHA512 daf09f61ee41802d6ac30498d8fed7258d63e7bae58e990b5b240c3a948293df3af04d798e6adc0b13c016dd498c5a86536c29680c8d0dcc007aeedaec89d649
-EBUILD you-get-0.4.536.ebuild 485 BLAKE2B ad233ced25f0b304b79dde1e452c7c5393052ab4fbbd240cf08b60e27317c2d37e240cbb8ad92aa3f0d0573e42284f47bbd0fef1e4aa614c5ea99942196c7875 SHA512 69f0b7f67b115bb6393c09ccea4bcee23b2fca6545df43765c475e54667bd33013b1d81ad648ca7b21316cc09df388569bd7155ac4f0214915a45719512dc61a
+EBUILD you-get-0.4.1270.ebuild 481 BLAKE2B 6767ed1e8591edc617c5841fe482525ed96aa629aec7bf5b89102cad33aa5cc550e2b86d73f19c6535ed107c0c5c942d85a67db5c6f0bdf127735f9788a0a2fe SHA512 9650b3ae2b2bbcfc928bb80e579b38d0bdd0cef7ff5b9d51af87b2598c0336a8f181bdfe185ce3ac21db0f84fa1c4da8797a6a4fb4389842b3784ee1fe18c544
+EBUILD you-get-0.4.1355.ebuild 487 BLAKE2B 68d6ff31cfe1e0ba3b82d91da90f1f7a9964176d89609a5415eba9b0f077e1242699c7be323d7c7c9c9019c6af7834e57fa3457b7cbeb14eca00fef36a1a7758 SHA512 9127d26de19919d6803ebe344c47ef2e86ae49799185a1a210424724d406a3d78e987fa63a656f086efafe0ae41730905c826c818a0562a1dc63477fe72ff019
+EBUILD you-get-0.4.536.ebuild 479 BLAKE2B 8cff0bd50d7ecc90be4fd627a2bfe55733a5fe12a24b7b72ddd163fd0ea933d2eebeac25545e6b294eda229b9b7e77336fb4294beb0dff02114ceadb8d210604 SHA512 7b783e4dd9759f43b433423cec7950f7aee06cac32208339a50c06c260a3a14ba7e872841fbe0f589b381849508ebcd635c02bece270d597393c918556a33a8a
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1270.ebuild b/net-misc/you-get/you-get-0.4.1270.ebuild
index 21add64c6073..de8bde115f56 100644
--- a/net-misc/you-get/you-get-0.4.1270.ebuild
+++ b/net-misc/you-get/you-get-0.4.1270.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{3_5,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit eutils distutils-r1
 
diff --git a/net-misc/you-get/you-get-0.4.1355.ebuild b/net-misc/you-get/you-get-0.4.1355.ebuild
index 4565235b1499..901c4ba7be15 100644
--- a/net-misc/you-get/you-get-0.4.1355.ebuild
+++ b/net-misc/you-get/you-get-0.4.1355.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=(python{3_5,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 inherit eutils distutils-r1
 
diff --git a/net-misc/you-get/you-get-0.4.536.ebuild b/net-misc/you-get/you-get-0.4.536.ebuild
index f0240b90a3dd..0e14fc8fd496 100644
--- a/net-misc/you-get/you-get-0.4.536.ebuild
+++ b/net-misc/you-get/you-get-0.4.536.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=(python{3_5,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit eutils distutils-r1
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7aeb29883a87..61f935071d83 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
-DIST youtube-dl-2019.11.28.tar.gz 3148365 BLAKE2B 4fd02a5f134f9efce133273539303de6700f02414a216085f444ee68751b94affc092a2960920660e29345848ae924b022d1e9e436827cfeb93bf94f1eed0517 SHA512 fd3fc9658428ecf96d681dd699db49e02f94343e5c49e370cb68a5764e8ecebc14b3ce5bc44db0a829b0d3c4fbffc96a1f8288fb24cbd21add6e9c7852b0915d
-EBUILD youtube-dl-2019.11.28.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
-EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
+DIST youtube-dl-2020.01.01.tar.gz 3156193 BLAKE2B 0052e8da07d83127a8c2cf3a25ab9733e7f4417473e89cdaf849e11e79285e4c8bdce5003b59f6ff8cbf3980043ce2e992346264f08caecebfa4ee33370203b0 SHA512 035d44aa4989067587d3c5a8d1bb4214bb7bfa16b91562c730fcf93de1578de75ddf12c8a0900643578546a4230da776b8b83f69378525c1480e9e0061f492cf
+DIST youtube-dl-2020.01.15.tar.gz 3159264 BLAKE2B 4f7b527e02e5ce6923f66db322c4ba8695e6e2850b7bcf4353914a27c31c7d5d28980b948326585bd2a25b76f4d7e903e8589fe1f137d905aca9ad30d54818d2 SHA512 1b450feef1d6040726f99e482edb6119b66224a98bdec1983f6921f21b08bd8fceb77cff055326b660fb66742815e5e0238807707547ef82b51b9966fdc82be7
+EBUILD youtube-dl-2020.01.01.ebuild 2239 BLAKE2B b0b08d37700f463c53c955d4396dd98eeaaaccd7573b8db735dd7ca52451fa41b0f24344d73b00e78fbb2a86e068373db8bfead32b1ebfca9a38408315a0bc1d SHA512 c82a5b508a3941afaa771dffbd88ca3fdff8fd1af5e1b13a0087790f76911c7cd98ad2f5d45ea1eb257d796ec302d59120197241e9685e9897f590b8af308886
+EBUILD youtube-dl-2020.01.15.ebuild 2245 BLAKE2B c555a3f395758ae90ad46f0db73dd28c9e98d38dfec4de8929edbc0f0f566847725c6ea4c3bec32bc2cb8ee4cda9e0c10c451d19f1cdcf6cf77e57577519b5dd SHA512 57e369eab168d96c31721ab6eb59021b73ef55e5571f5d4029fd9250907061a38f1aaacc0ccce528d0bfa33365f5b53c76400bdde116d8b50733915591de55f2
+EBUILD youtube-dl-99999999.ebuild 2142 BLAKE2B 1f9fdb555f7f4fb60cfde00f72e037149e9d12458984127dd72c5fb75c27fb6cb4590dc3b81986d8f42d0beee66aed95f5efd5527de21e2b1be6d0065dd5664a SHA512 572c11fd1428ab7ee83a3e6deadf68c378b3ff4f47dca74dcf8604fb4e82e1d8e6f55e64cb1067d011143f212dfff27f923c739834e46f0b226683bfa2c31f87
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.11.28.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild
index 8b7913f66a7d..41719258e92c 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.11.28.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.01.01.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_{6,7,8}})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
@@ -11,24 +11,32 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
 KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
 SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+IUSE="test"
 RDEPEND="
-	${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	|| (
 		dev-python/pycryptodome[${PYTHON_USEDEP}]
 		dev-python/pycrypto[${PYTHON_USEDEP}]
 	)
 "
-S="${WORKDIR}/${PN}"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	distutils-r1_src_compile
 }
 
+python_test() {
+	emake offlinetest
+}
+
 python_install_all() {
 	dodoc README.txt
 	doman ${PN}.1
diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
new file mode 100644
index 000000000000..faa91ea76c9b
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.01.15.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_{6,7,8}})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+IUSE="test"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index f30b1cfa0a04..e5aaeb99e391 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -1,28 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+EAPI=7
+PYTHON_COMPAT=(python{2_7,3_{6,7,8}})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
 HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/ytdl-org/youtube-dl/"
 LICENSE="public-domain"
 
 KEYWORDS=""
-RESTRICT="test"
 SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
+IUSE="test"
 RDEPEND="
-	${DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	|| (
 		dev-python/pycryptodome[${PYTHON_USEDEP}]
 		dev-python/pycrypto[${PYTHON_USEDEP}]
 	)
 "
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
 
 src_compile() {
 	distutils-r1_src_compile
@@ -30,6 +34,10 @@ src_compile() {
 	emake ${PN}.{bash-completion,fish,zsh}
 }
 
+python_test() {
+	emake offlinetest
+}
+
 python_install_all() {
 	dodoc README.md
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /net-misc
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)