gentoo resync : 15.12.2019

246 files changed, 2306 insertions, 2113 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d132e12d99e7..8d094cfcfd1c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index fe8983b95864..bb38131619af 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -1,4 +1,3 @@
-AUX adjtimex-1.29-r1-gentoo-utc.patch 1053 BLAKE2B 1f17ac2e1a508a3b54f7a1bb59de0338fc2c743bbd3202b09fea4310e4af5e8c282b4c70300708eaa4fe5ae313246ba1b05f18d12d0c73861042ef00f13b2b71 SHA512 d9d47fc4648b51969b50545b8925848601f373ba89908cdcb95e37b6ec4489b0e338bed4debed9a5fc1fbb3fff6a87c27583a25a89028bdf69dc09602c67d728
 AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e44a956b02830c80d3e2edecd5dcff9daacf869ff1f1e3613afb42c222287565a5c296f72d0729e5a928a58180039bc5e282 SHA512 7917ae69ff554c3b7de8be65f3758e9bcf80f5875afeca8d9ff81d1fa4bf4783f65c98b28d4d705fe585fb7a23b7e64af7d9145eb9286c24d7fdf2053a04e5f3
 AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041
 DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b
diff --git a/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch b/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch
deleted file mode 100644
index ac8730d1ee7d..000000000000
--- a/net-misc/adjtimex/files/adjtimex-1.29-r1-gentoo-utc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- adjtimex-1.29-debian/debian/adjtimexconfig	2011-12-23 21:29:32.962449759 +0100
-+++ adjtimex-1.29/debian/adjtimexconfig	2011-12-23 21:30:00.610638657 +0100
-@@ -3,6 +3,18 @@
- conffile=/etc/default/adjtimex
- startfile=/etc/init.d/adjtimex
- 
-+# Get UTC setting
-+params=''
-+if [ -f /etc/conf.d/clock ]; then
-+    #baselayout-1
-+    source /etc/conf.d/clock
-+    [ "$CLOCK" == "UTC" ] && params='--utc'
-+elif [ -f /etc/conf.d/hwclock ]; then
-+    #baselayout-2
-+    source /etc/conf.d/hwclock
-+    [ "$clock" == "UTC" ] && params='--utc'
-+fi
-+
- echo -n "Comparing clocks (this will take 70 sec)..."
- 
- # Get the parameters
-@@ -11,7 +23,7 @@
- baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust`
- hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust`
- /usr/sbin/adjtimex  --tick $baseline  --frequency 0
--/usr/sbin/adjtimex  --adjust --force-adjust >/etc/adj.adjust
-+/usr/sbin/adjtimex  ${params} --adjust --force-adjust >/etc/adj.adjust
- echo "done."
- ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'`
- freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'`
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 206a599461fc..e2bf5c6a335d 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,13 +1,16 @@
 AUX anydesk-4.0.1.service 276 BLAKE2B 1eb07a90a1e2369c42be849e9885d0696f1b68ff1f21bef3907e0772e930ba41dbed6228e7be62f1fb80bbcc02866294d6f0040e7d8a2928ad409d3bef78ae5d SHA512 af74f74030f6834dc85f0275a0a3f7ef8eafc902a5b8eb99197574c60de1658cd70f4e3152876a1e9c86349473c2e52bba98302d366fa1b1f2618373f90e0f78
 AUX anydesk.desktop 239 BLAKE2B 3e9c2d1b93b7efe9731ffb1ba1202620b71b4c2655d1b053cd303b4e122dac3423998c3bad3b41b491a820587cda5a959f260937f5b5c4ebeed27583d90d2caa SHA512 c6ec7c6022b7cd994d80fa8f3d4bc583e84dc616e0567e50b6a62145ac32d6157eb00a0202633148b00b15523473f3284ca698035ed55bfde9694e3407a8d25c
 AUX anydesk.init 291 BLAKE2B 5fa5d60240f3342e53fcf7aa17df6d658a98b6446887f73e04eed490824876cebe9fca7844c4e33737f6b4e01787a2134089de78152503130d4ef4a242bf3f12 SHA512 63e60d0442355f567e24bb6042710e998ac7ed09b4d970cd30bb6910955bc95e7629f63a4988c2b92067cf273aa04893510cc31971def96bf453c92b673254c2
-DIST anydesk-4.0.1-amd64.tar.gz 3663439 BLAKE2B 6d693262569708d0289f9e4b03e15a4d4b8d7eea5253a18c6694d720e916b9d3d2a6894db16e5e6a31ddc39bd87ef4e766244047761440f9245c5f563ccd8dd4 SHA512 df2d4ec945f77954b8548513052af4d4f16c904ba450f4560c9185e94c2d4e57dc5ffb865239d1082803e040a60775b78d9c09015932b0fa6159378475d73f10
-DIST anydesk-4.0.1-i686.tar.gz 3658518 BLAKE2B 39bcad58de9b5ae76da5e96e32a8799343e1b6f7f78b3db3d02e675acae1ebbfa5c2a47a043b9d88810644656bce027bc347a783fcccbf37cdf44f986f1a8548 SHA512 e922e296149811a7ef77ae642c9ba73ca9888be57f13b0616ba5008f6837c86245d4b8b3a4b8ab6739a97fffa9b397b20d572c1fae7d5a5b2d909e8ee07112cc
 DIST anydesk-5.0.0-amd64.tar.gz 4258837 BLAKE2B 1ebb7cb70226873e9a2207823a1d66eb6b2dda9846d2921fc4484638f1bb4b9bf1abe4897af38fe7fb4c1c585187121bcf54bda5bd33a48c052fa5021f5cac07 SHA512 f18a3374dfdc62fecb7d47cdc6d43f7ec71433ed06f4c7165056e9b9526acd624305b0409cf1140f85631f8d7b72cf032ff32298ea24781c8e48e58d7e50abf0
 DIST anydesk-5.0.0-i686.tar.gz 4259050 BLAKE2B 43eb38dda82e6846c3e3c47f28f2556d93a4a420ea82639c7be0fc122a4d1bfdeecc5bbe7088687a54a0cc992307bd0ca4502a9c46539e459cea2d362a962622 SHA512 bfe3b39540aec09432343c554ec761072dc688f271bf164c1b3d6cb54271336b5cf35b51a93902bfad2d92d530c186abe108cc250f2a7f88641c66abd42b3c6a
 DIST anydesk-5.1.2-amd64.tar.gz 4502952 BLAKE2B ff59e13161f58d63512da17162e32e52625ac7ab2698053e5183b10bf7971955797194962fa91d77a2f4d72fae4192811382f3c8664c859db637b6ab6adcd82d SHA512 e05fd51b77dbe5d4deace5dc245481a76e9c27f01ae8240da2eb510fb7c6685f5bb0cc6b89920dfb1aea10002f22f2a1e5bdd8d11a4a608224c2becded88f8e7
 DIST anydesk-5.1.2-i386.tar.gz 4498951 BLAKE2B c9e44513dd2c49fa9ac0312e5a91201161905d81a66f15ab3be0b3f65f3f2c638c584191b120998a8a3961528c185844a079461a8d273dac67f314acb7ac1108 SHA512 51cbd953a93591c7551ddcb17450aff43ddf3b93280f902326f43f9a07f5ed4fa7de1e6ea580b4d56bddfbcdd772c3cdfdf3c85233fe8b6783e7fe681a2095af
-EBUILD anydesk-4.0.1-r1.ebuild 2278 BLAKE2B 52408a66fb764f8286f4efdf25ecb63f0343bca3c19687fc54f91f0ed478d89e0a87a3c5db5b12df78fe962564ade248d87883e0edf1492448601c1db7592975 SHA512 1990f9f67117e25f46ccd4af5ad6d9a23a8854c226f0c808b2f0222b8845da5a750b6f796eb3460992577b654bd8fa8f777c5fbdbfcccac419b125414031399c
-EBUILD anydesk-5.0.0.ebuild 2259 BLAKE2B af0627e3eff482a7d4383244334775c08b1ecad8eb021fd161576f1357812794de6679c9da42a186d8d606c9658cb6d9715ec1d17459328bd0b327a21943a0f0 SHA512 b53cf1b2f63e9b6d7157a4cbcab416744716de1465a1a8f908575d0af8273fbc6ed9d2538fa40b6badee6f8a1bcbd507e85700943ccf481038cef0fbcf9f8124
-EBUILD anydesk-5.1.2.ebuild 2275 BLAKE2B f10cbc810ed587182af61c0a2175a7f34e01fa6aeac5bd4292119b032bfabd5d962029ae7da0f8375ad4bf6d0ba10818698ae1de7404242915516fc37fc77059 SHA512 c068f2b82c0d8feeda9972fbf19b3a04e8ce60e3262bc8aca615d624e8f8059104efdb4bd3134b4c46b275dc1eebb3139eb0ad09d4ae74e0dc247a64517eee4b
+DIST anydesk-5.5.0-amd64.tar.gz 4649329 BLAKE2B 13e3365990ec521e430e52c0e2e3a58e1d7185dcbcc8508ac4b9db364052e5d5a74892911378abcb561f5df52b7dc27cd1d169df99de8de7096b2e2adedea942 SHA512 214454ca04ad5ad724b5704982e51a1146f4926acf467607d10954e0a7468e636acf03f654d1f1dfabcb4c1591a5ab2d60c6cf2361da88b3ac4f9cbb14342fc6
+DIST anydesk-5.5.0-i386.tar.gz 4642620 BLAKE2B 6d6c929c2920964dacab14ca9a5bdd1f45dce0787ceb9f3cccb01223d4f1a7b8c78c873ec94018156220a15bd8d7fb0396af3031be2b4e0babb2674c9ec0c724 SHA512 a0e7be73678da1d0eaf9d8c57c299e0433c726de20ba8e458d8ed8b2f81e37773f16372d64c96e0d47ebee33465c2e706ad9217c7842bdc2b81f6060e7788412
+DIST anydesk-5.5.1-amd64.tar.gz 4669630 BLAKE2B 0b2a6096444d0424fcf52451c0a13e10a4cc248ec5471ecdc74606e21d90e243da6d1c4179835d7c2a4ab1fb736667823aa9c020e526c5103cf79aa6cf9635b8 SHA512 059c3d9571bdae2aa863289fbdf02f5f1f3c4c82984ad6e4beee23f1b79fb9fd0a1bad3fb984d864ddf7d65e502ab75567b00707bb85ab95851d8cbb0f24f26e
+DIST anydesk-5.5.1-i386.tar.gz 4662698 BLAKE2B ae9aed26ca9fc0d655bae7150e923dd0dbbe263ce31e7f6509d5cba761db02c9af69036e750c734d4d86c851dcf54697c09eba1ec9d25a4d3583c40323d28647 SHA512 db8c399190e9b9d8b9dabf3ead167511a7d2d17a552b7b25c43d92fc77320a7013667522d8a78bf961f103dff9185d1c2b6ebedf418f5e824815a4aa59c6021a
+EBUILD anydesk-5.0.0.ebuild 2402 BLAKE2B df0ffe425b26af1cadfae8c06defb35cc72696b446642957c4c7f25a6d2f66f59c96e88ce8c4f66ee9044ced138548f4a272d7dd30dc204f524048d83d698429 SHA512 67f1b6eb1f9c878c51689b11c4d49a628056ee9a201e11a840d78203569abe994bbf8d1c7f3737b062a017c2310462578774b810d5a941a30ef76ce1b55c06b1
+EBUILD anydesk-5.1.2.ebuild 2418 BLAKE2B 3e8343e9c5f464622c6b2638d4e0de350c582e427ea397e5fa95bc0a1fecd3b5d89eceb2d5bf5f35c77e1a53c3490b968dfcc96ccda99e8944ff2e0c71d9ba16 SHA512 ed1f4d4bf8c358f3d1019271534c051ff18791ac5ce550367a14e3206fbe5e09964e0670185d56de0d1afa2e6787da8a9b8c1faa2e58af4b93957ba2787117c5
+EBUILD anydesk-5.5.0-r1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b7a020ee426e2ae1aa605bf786575b6efc1c86c7747e5b8e3cf9cd774001c29b4d4142e4a358c8b85806dffb41 SHA512 bf68271d34c56804b63226d80784bd1b1fb9f4bd6f3a6c25722912e472be04c1272233f64a361d7f53194c16b8df4c3e16468e72ffe7e77623989f6144b0d116
+EBUILD anydesk-5.5.1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b7a020ee426e2ae1aa605bf786575b6efc1c86c7747e5b8e3cf9cd774001c29b4d4142e4a358c8b85806dffb41 SHA512 bf68271d34c56804b63226d80784bd1b1fb9f4bd6f3a6c25722912e472be04c1272233f64a361d7f53194c16b8df4c3e16468e72ffe7e77623989f6144b0d116
 MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-5.0.0.ebuild b/net-misc/anydesk/anydesk-5.0.0.ebuild
index 6bd890da6453..7a87b3cd2f86 100644
--- a/net-misc/anydesk/anydesk-5.0.0.ebuild
+++ b/net-misc/anydesk/anydesk-5.0.0.ebuild
@@ -7,8 +7,14 @@ inherit desktop systemd xdg-utils
 
 DESCRIPTION="Feature rich multi-platform remote desktop application"
 HOMEPAGE="https://anydesk.com"
-SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
-	x86? ( https://download.anydesk.com/linux/${P}-i686.tar.gz )"
+SRC_URI="amd64? (
+		https://download.anydesk.com/linux/${P}-amd64.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz
+	)
+	x86? (
+		https://download.anydesk.com/linux/${P}-i686.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-i686.tar.gz
+	)"
 
 # OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
 LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
diff --git a/net-misc/anydesk/anydesk-5.1.2.ebuild b/net-misc/anydesk/anydesk-5.1.2.ebuild
index a3bb4194a948..a727ca0739fa 100644
--- a/net-misc/anydesk/anydesk-5.1.2.ebuild
+++ b/net-misc/anydesk/anydesk-5.1.2.ebuild
@@ -7,8 +7,14 @@ inherit desktop systemd xdg-utils
 
 DESCRIPTION="Feature rich multi-platform remote desktop application"
 HOMEPAGE="https://anydesk.com"
-SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
-	x86? ( https://download.anydesk.com/linux/${P}-i386.tar.gz )"
+SRC_URI="amd64? (
+		https://download.anydesk.com/linux/${P}-amd64.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz
+	)
+	x86? (
+		https://download.anydesk.com/linux/${P}-i386.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz
+	)"
 
 # OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
 LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
diff --git a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild b/net-misc/anydesk/anydesk-5.5.0-r1.ebuild
index 5f3f5977062f..507027c061bb 100644
--- a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
+++ b/net-misc/anydesk/anydesk-5.5.0-r1.ebuild
@@ -1,14 +1,20 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit desktop gnome2-utils systemd xdg-utils
+inherit desktop eutils systemd xdg-utils
 
 DESCRIPTION="Feature rich multi-platform remote desktop application"
 HOMEPAGE="https://anydesk.com"
-SRC_URI="amd64? ( https://download.anydesk.com/linux/${P}-amd64.tar.gz )
-	x86? ( https://download.anydesk.com/linux/${P}-i686.tar.gz )"
+SRC_URI="amd64? (
+		https://download.anydesk.com/linux/${P}-amd64.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz
+	)
+	x86? (
+		https://download.anydesk.com/linux/${P}-i386.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz
+	)"
 
 # OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
 LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
@@ -17,28 +23,30 @@ KEYWORDS="-* ~amd64 ~x86"
 
 RDEPEND="
 	dev-libs/atk
-	dev-libs/glib
-	media-libs/fontconfig
-	media-libs/freetype
+	dev-libs/glib:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
 	media-libs/glu
 	media-libs/mesa[X(+)]
 	sys-auth/polkit
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
 	x11-libs/gtkglext
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
+	x11-libs/libxcb
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXi
+	x11-libs/libxkbfile
 	x11-libs/libXmu
 	x11-libs/libXrandr
+	x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXtst
-	x11-libs/libxcb
 	x11-libs/pango
 	x11-libs/pangox-compat
 "
@@ -66,16 +74,16 @@ src_install() {
 	insinto /usr/share
 	doins -r icons
 
-	domenu anydesk.desktop
+	domenu "${FILESDIR}"/anydesk.desktop
 
 	keepdir /etc/${PN}
 
-	dodoc changelog copyright README
+	dodoc copyright README
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "To run AnyDesk as background service use:"
@@ -91,14 +99,18 @@ pkg_postinst() {
 		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
 		elog "further information about the linux version of AnyDesk."
 		elog
-		elog "AnyDesk might require the following commands/packages"
-		elog "for some functions:"
-		elog "* lsb_release	(sys-apps/lsb-release)"
-		elog "* lsusb		(sys-apps/usbutils)"
 	fi
+
+	elog "For querying information about the host PC AnyDesk calls"
+	elog "the following commands. Feel free to install them, but it"
+	elog "should run without as well."
+	elog
+	optfeature "lsb_release" sys-apps/lsb-release
+	optfeature "lspci" sys-apps/pciutils
+	optfeature "lsusb" sys-apps/usbutils
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/net-misc/anydesk/anydesk-5.5.1.ebuild b/net-misc/anydesk/anydesk-5.5.1.ebuild
new file mode 100644
index 000000000000..507027c061bb
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.5.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop eutils systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="amd64? (
+		https://download.anydesk.com/linux/${P}-amd64.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz
+	)
+	x86? (
+		https://download.anydesk.com/linux/${P}-i386.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz
+	)"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/mesa[X(+)]
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/pangox-compat
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	dodir ${dst}
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym ${dst}/${PN} /opt/bin/${PN}
+
+	newinitd "${FILESDIR}"/anydesk.init anydesk
+	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.philandro.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu "${FILESDIR}"/anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+	fi
+
+	elog "For querying information about the host PC AnyDesk calls"
+	elog "the following commands. Feel free to install them, but it"
+	elog "should run without as well."
+	elog
+	optfeature "lsb_release" sys-apps/lsb-release
+	optfeature "lspci" sys-apps/pciutils
+	optfeature "lsusb" sys-apps/usbutils
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 05effe99c163..b589fd9dff01 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -9,8 +9,10 @@ AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eb
 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.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_p2.ebuild 2863 BLAKE2B 20318be65af24050ec49f9b429e5119d0a0a2a7b426b66bbed13e861459e601e873d6abd6aceb540f11d75b316341a70d650160cf194b9dd60967fe7dff00c70 SHA512 bd2bd0728bc5049dc54eedcd38a09c5c33615cf09054e0e9bbd141dce845e0dae57d5d793c99406060871e7f375b962bd335fe9363f3e627095bc85acbd76682
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
new file mode 100644
index 000000000000..fe76de4838c2
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
@@ -0,0 +1,133 @@
+# 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=(
+	"${FILESDIR}"/${PN}-3.3-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
+
+	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	dosbin ${PN} acngtool
+	dolib.so libsupacng.so
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd || die
+
+	newinitd "${FILESDIR}"/initd-r2 ${PN}
+	newconfd "${FILESDIR}"/confd-r1 ${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
+
+	newdoc "${WORKDIR}"/debian/changelog debian.changelog
+
+	# 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/aria2/Manifest b/net-misc/aria2/Manifest
index ac8150b0b3cb..c760b0cfa79c 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -2,4 +2,4 @@ AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec692
 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
 EBUILD aria2-1.34.0-r2.ebuild 5014 BLAKE2B 11ade715c629821946b28812b7990918f0134093f3bbc374701a0ae196ca46ea569caa2d435f91250c07489603e3a222556a3eee30dc8c052aaf267802942ffd SHA512 ca8aa1ff070bb11b5d542f93e07b573eddbde3286f82101c3b2a2b65eccdb30872e66388185092fa1113bd41542e1645b213960cab5b15eeeab62f1ac9da992e
-MISC metadata.xml 1442 BLAKE2B 82e8426004e56ba96a5f8766a6d04325ea3919ecfa0996da1d767dc4f4fb2b3277d1b3e4b60d369bc7636eb557af336b890c4bde0b49ee39cc3352050a112fe5 SHA512 61da3c1c3cd1535d208e7ae1930fc2af16eb2080f99c923b9bc405decb50f09cf5acfbb1e922c3eb7edbb799f359e8e9762fe2e67ec24ae542613459250c6f7b
+MISC metadata.xml 1331 BLAKE2B ab520da311f770e10183a680eaf5ef9ef5ede6abdd30a4eddfadaa338a9007af6bec9ea591dd38a11b56e8b8f4416f0d422e144bf67a0959b78473dd074d7ab3 SHA512 805cb1b92b2d5f79edafd68bb42b08a494ca13e3f9ec8c215fb5252a47c596f0d60377dc350eb01598fecddffdf3ebc33e742b44a2e481ef3ad82daa026eac7d
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 27fefc927194..19197a13c240 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index d4804b80804f..9ab24dba3bce 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -1,75 +1,157 @@
 DIST asterisk-core-sounds-en-alaw-1.4.21.tar.gz 7542917 BLAKE2B 957578056d6dd5057b9d05ad24e2fd356df1be6c03cb1452fbb6de96d72d7bf613de47f6389c09f09cb513e26da273084a16e2dd2dac6f82be592b93391ab4fc SHA512 9cb9f5a7ff538223f7ade7c107d8c43ac36aa90eb2c53bd61e3189e81e4cde2e3aeee2ac1a77aa2bce1afa529e3f940f3518da2a5247b30f34ac1e779a7c33d0
 DIST asterisk-core-sounds-en-alaw-1.4.22.tar.gz 8533300 BLAKE2B eac9024fb91c2588cc3151a10148baaadb1e61a0e5e3332680f316b3c1fffe105511e96e820c79ab2a101755e24cb0ece6ea7acb1c2db309cf65f057d31f07c0 SHA512 d2d57775115d29ece8cc08f90971c34efc6f30e77a9b1241c093ba99ec841459338c8589ab01aa4d4736848ad5c42c3b9d47587ca75f9fdb128cfbeea1d79a04
+DIST asterisk-core-sounds-en-alaw-1.6.1.tar.gz 9937284 BLAKE2B 58dda94ef6fc66b8b080953e7f98bd1730ed8f975191ac4f1e02510ad731ce8c4c08fedb96c22f08a8ef9f0ad532b13c5af53288bfa21e4e987ab9175a7a3c65 SHA512 6014048911d2096176e9651145d46d8a2f12117bcc2b08ffb04c5123f59ace32453853078ed6ad5584619f1783ad34aa7bcb987235f9d6c5494350b27dea8c00
 DIST asterisk-core-sounds-en-g722-1.4.21.tar.gz 8048225 BLAKE2B 4bee4f9b6d21b304cd72d5898b4f952d86e9c62d1c06af9839b4ca7b92f2e0462ca73e751b2277d3aa5d8fe95c7db1eba29476de6f1221987c711f1f07e0e342 SHA512 4291b3343462ee7f701239e3a20e86e81ba71044d5c711e96c3524277eda60bdc5005ec1cfcfa26db7d09d90a9f29764cb2060e0b8edd0ef2c5af2aa0dc28e63
 DIST asterisk-core-sounds-en-g722-1.4.22.tar.gz 9058583 BLAKE2B ed868b68aa911a53ab75071db2ebb92899424a54f6d679184f64cea4ba975a41f532fb93cd97e6d44b8fb5489f2720aa394a7bc5e3fbb4c422012d77d8d0955d SHA512 2f0a01a5ef24b5b64de998be5a4a572b8a7871de01b2c46cc78e0e35988d3571343858c666ba59ca1f0cd6aaf35a46a2adaaad0afe10b453587422d337662651
+DIST asterisk-core-sounds-en-g722-1.6.1.tar.gz 10756090 BLAKE2B abb720c2b8e74ac504e0b42c653e6e119d5b374f1e235a696800967f29a0180c9090644189390def45284e2f502d14ea0b0ba5606b0c0ba5cf90689111c8536f SHA512 e9df0fb1386a6f981765aead76ccc43a05772696ff5ebf9495de532709c2eb0e0f119b940ddefb8c3f50babf9febb3123c9997c3dcf5a5b42ddb6ab7671bf39a
 DIST asterisk-core-sounds-en-g729-1.4.21.tar.gz 1116090 BLAKE2B dd78a19ae255a3dfb73778ec2230706b71587cc98d41f89b1928aad31eebb461a3fd56605e0a5508eda13ea1aea1a38b9150811fb540735a1a6c5c8ed3f56e98 SHA512 ce9d64a97183b094069c5d90ceeafeb78a4cbc512b1c40396f5ac6caf285b961cb6dac5165a4a95e94523910701f80be5d27179c875776c5747f49423e112132
 DIST asterisk-core-sounds-en-g729-1.4.22.tar.gz 1281828 BLAKE2B c5d0ce9602012f88493036acf40308e462f555c3bb83c3b83ef5321a90b4436f3b3b747df82df7337cfc69da708897ac7e458ab8906a1a8d59ada9c187784e58 SHA512 62b96851cc2ef8e2801b81ca6e6f289a7ff44f6477b39a4bfb1af3f81feb5ccc429cbbd8ff6902910af067b981764f808f2ea16bc0c9eb8ba1138f72aacf29a8
+DIST asterisk-core-sounds-en-g729-1.6.1.tar.gz 1557751 BLAKE2B 6e31f5e9e96e9e9e85a264d31dfdda1a8e479d12b7172400ff2e6e27c4823b90a0793abab7e16aadb85b5fd04dd321dc49c7ed8813e685d31e6520f42f056dbd SHA512 5f0c4f7eebf47b52a43dc0d2bb01a8c2ab3e42206834754bd52ca113be80e5635b3fff2ca31a637640026ce1872679f84048f61edfcbc28f2245ed4f6c44c342
 DIST asterisk-core-sounds-en-gsm-1.4.21.tar.gz 1785758 BLAKE2B 0477abad1bb4233c761abfe973f9e6e0d4adc778deeec3d86748aadb4f4e88c9df368c4513c0173d0cf0f15afd317344ca734ca9ecb66f75360926f21ee9a3c1 SHA512 0c5590dc7b7b6a926319f653a0ae2e66f86494e22bee5f793fc40eb93b6e0f60b82b4988c3409411ad8458119b6706f4f164a9322621b0f9efae504ffd07a099
 DIST asterisk-core-sounds-en-gsm-1.4.22.tar.gz 2042362 BLAKE2B 412be469cf7f50b8ec5d1863d3b616a5b9fae7a01915f9e39222c4e641a9c6afce17c95998b44f688a7fd4c4cb85db9d4b6c492e06beb4e572239e6650624b65 SHA512 d2755beb8d5be64129d84fc28faad61719599176a87cd17145be68c051bf19741419bc943531804de92ae8e098620f003c6401c1888711a0eb7dc4766c8e824f
+DIST asterisk-core-sounds-en-gsm-1.6.1.tar.gz 2466402 BLAKE2B eb32d6657cb42cbc659e08f65a4e5b328c25f6c22c5c941df6bfd1c90b41474b4e5fca863fa57e447411fe05c0e449035b9ca01bb8c1d341936d2500e9d95204 SHA512 ae2b1f871de207bf7493574a30d65379668293410f8e82232caf4976dedd0031c3f328af82e7f4e77e3de9b62f5d12d7b4f578b9a1ff89c4134225e0ba0401c9
 DIST asterisk-core-sounds-en-siren14-1.4.21.tar.gz 6800650 BLAKE2B f24b9d6ee131f576191406d2781ddf8400c9d8ff8099abeca1574652a0c863baa8377d5f44b09609653c18044665948f7469b0bd99ebd1bfc111409764e11297 SHA512 935f0342e9255fb73d8c6bc6c2b802e341aeddb7b38323fdeeb8b11044eee57046f6783466729ff3f8a8ec6323b879eaaef1a24f674fce8e4322f7903cdec857
 DIST asterisk-core-sounds-en-siren14-1.4.22.tar.gz 7777912 BLAKE2B d4c785bcfce51520aecf010c05688f9c326db99acb069b28fab9d9e0a42dc06fba11d857ef5d7df1d232d7c7e8d5caae33b8ea92d407d33bb9fc2d1a54e82447 SHA512 0a591dcde5362f89b7e022ec84505d85f0ca9d5be302f27be83b0143a02985c94249161aed332847f9e75015b9593bfde031fd0370a9cf5e8549df729031a3e5
+DIST asterisk-core-sounds-en-siren14-1.6.1.tar.gz 9120763 BLAKE2B b65c688d8da115ff89a66c099c9c1568086f2d32a878d5517d402243525d5da474b3edd222bb9d46ff2be63f8c0acffa0c66dd58018b76c8cba55b1c90b47257 SHA512 1192209ba4e59bd9f16bc2999d247393c65b906b51b477edef6fc285cb00a96cfa54aa6fdcb40941e72931a92702d32c5e43cba8b12ee6c8dd43f1f493876a0b
 DIST asterisk-core-sounds-en-siren7-1.4.21.tar.gz 4297051 BLAKE2B 091db354987042a57bd9e72d50b05c2ae305db87110c1bc070bb9d3df0dea80b44cf00ebcc5e780ded54bd05f32d428bb52e0e74f4628c9875c24ec84b0fa3ac SHA512 5991c869b1064b50f58cdddc92dda29dfc5566225ebdb5127f2bf659b01aa093af7f319c13ff440937a937d4489d67966d7984feec1c3c2bb0d50bb07c81b68b
 DIST asterisk-core-sounds-en-siren7-1.4.22.tar.gz 4939217 BLAKE2B bb59b75817624ded3f1a19decdb40e99c3d26231e6403b790033bbc66111cefde727c6845194a3f3dcd3cfa87e2e950eddfd1a95aa702dd85bc5ae6567b0d271 SHA512 6b782ab64725aead51a35fa773f834c1ff423d21a9f521e231a40c6f995cb4a05b1a393e0a0892cd199cf96309eb8552030b02749cf169943bd4de68e60c6593
+DIST asterisk-core-sounds-en-siren7-1.6.1.tar.gz 6028362 BLAKE2B ddaed514551b8445c5c112ae0e3d1c1f019ec1e0888151bbcbee1b3188ade576fd0adaaefb0ffc5999ed14a30107243eadc490d00f24fd1e9f2d1bcc3b50eb4a SHA512 92dd08d94ccb2bfa3e07ea0d4c28784efa892431e4794af1f52fc454d06e432854bd81e42e00cf8e766314140653b5423857f89baed65433969a790deb5dd889
 DIST asterisk-core-sounds-en-sln16-1.4.21.tar.gz 31127736 BLAKE2B a9361eaf102477c5025f912d5717117cb62b14949855d981d7df6de6fb48a6c583f2d1054cdcbe7b144dd8d176c9e982e3cc4c7f377f5fc9b16767d35cd0d94d SHA512 013572c9f9c80b26f85e92117d4bd853660634b66b4e52c2bf34b5658b92b871b765e457d4866f35af596658c9600ecd8df00d5b725755e3e8924483e30837a4
 DIST asterisk-core-sounds-en-sln16-1.4.22.tar.gz 35390902 BLAKE2B 99da6a0d8900f1b5aaa1f30cbdd5b0e40ff2eda2642d890c4305fca3be4fa408b60bb5df52fb5d2f6eb6912ef8ac67238733a25ff8cd9b438784adad83b6eda7 SHA512 cdbf5d13843f5be6db8423627579b181b1619f543c32b51f90dc40ee8f0cc9047441a0436e9f7fa3e9f12b54e05689b356da06a7068e9590963b72ae4512e983
+DIST asterisk-core-sounds-en-sln16-1.6.1.tar.gz 41366110 BLAKE2B f6901372262c35d5d271ca476fb613670ec9c775b4f95209b5c04017e284bc74eb54294b43272c5b61fa5bf82bbf3a8938b48fc9b674e54e1ec696c9d76e2518 SHA512 c117361421d4b115f822f598769bdf9780ba67083f7e197e64e593651287bc9d281f9c5a22e3c9f281559b2cddeecdc9872e697bdd86304592dad8744bfdac48
 DIST asterisk-core-sounds-en-ulaw-1.4.21.tar.gz 7663285 BLAKE2B c746416485d2ee2eb54b01cb52146bef2837a0bfa1aa31508dbb6ddf13e79b5efb109e0d1c507da837b422c8ce6d5a5ab9f833d5054a38575bb13dd42eb11a23 SHA512 bee290403b91e9c9b5e2e6e9b83d97a0b2f654e6e1567290eeae28e81db7d24d9315f82b402f1f1de567ddb5ee9de5870be8b165026e5423cc5408d1901fcef0
 DIST asterisk-core-sounds-en-ulaw-1.4.22.tar.gz 8683123 BLAKE2B 2f074ac56b7d51f52e45e967a981597a33c88235c33ac01f8e396db03888d126fc04d027d3bf888500ada145deb77f26c8c919b51a28905fc326242c534c4026 SHA512 171724100401582bdf4e506f60b67d3bc6b84c26bc641eb8fcf1d2317aadb2751e3238056863ef5ce470494c930e8984dce41513169e980cc2199d3290301193
+DIST asterisk-core-sounds-en-ulaw-1.6.1.tar.gz 10241447 BLAKE2B 444f7d860cfc3a86762468fd4f7695ff0c8dfa0721345bff0affbefe4ee7c86627807cd20b7b5596b3f2c9da7a82703555de694537e6bd81b1757524aca68a02 SHA512 9547c2d41209ca53e67b66fa3d65503f19e3c833107d6d4b864c06ecbf4afd962f93fa9a7ea3f42f6ceb08e942b7afe6ce7d06fdbe04c2ffb28936ff5db521f5
 DIST asterisk-core-sounds-en-wav-1.4.21.tar.gz 15317471 BLAKE2B 22cbe99112857603be85eb30c8872b2914e0d944ebc77380904c846726af73fa6ec23d3aac7f7a48725df0b87335533fe9c082288f9e0648f322c29372d9dcc6 SHA512 020265d6d7e98707e7604a6401de1e71e59aaff888fba2db7c624982d1c5c0d717ef1b2e23f36f88a2a85a0c78666c7a77be6aa79c7f0cb57665d026c389ec71
 DIST asterisk-core-sounds-en-wav-1.4.22.tar.gz 17394370 BLAKE2B 286de98de1501e55c68b6faec64b7dbd9d3c20890a3a3552159377861519cf2a92cc646a06834debdcdd70e4aebde38e4b65fc0f06308defe0a9d37c6f0a6e8f SHA512 ecfa10b1bbd771caef9722c2f9bd48050d8ec53617617aa566e4ca082c46de44fd26cfe683ea1a330f343ec9249126b59f6de4aa7a31caeb2e7fdeac7b55af97
+DIST asterisk-core-sounds-en-wav-1.6.1.tar.gz 20176188 BLAKE2B d491d8f08ba6ba6e64026421dd00a1280d76ccfa7c0ec67ea18a2046fe60f4f761d29bf019131583f41b1cac659c05c3f66277afe7a3aa70d41193bebabd32a9 SHA512 2dd0da005a80d8cc40c31137c26ce2f51bc4b6ccc0fd0cdf092396d3409744905e94c6225d79e0c587ce3bd31917f06d902f31a58296dfd83768346ca47e81ae
+DIST asterisk-core-sounds-en_AU-alaw-1.6.1.tar.gz 6698700 BLAKE2B 83ff85627dc111dffa8258d3f73e9fc8a732d4bf9a016dd0804dc8eef84d574c4721366854df20f6b2d0cc017ad7b712f468e6e37b8754beeae98f58ea332f43 SHA512 bee07d0a371ad7bba8359b611be84ee56a726eb8237e90e0695b82f44627e4c94246f638c429c973886197dee14f3c443ae3f9b10965b26444151fcd1d5f61e8
+DIST asterisk-core-sounds-en_AU-g722-1.6.1.tar.gz 7388595 BLAKE2B 7fe0a8b5eafd9e6e8e22f29d8a5e88c11c602e37d8fd511003dd6a45a332c0c48ad9fc6f12e14db1eee56bfc623f6520189b0070485a97fdca59febab5a0f2d5 SHA512 bbee556d279318cb1363ef95ba01253d948873076e632ac6f6cfaa978ceb5048d8f6950afe1d3687c77e71c1854d8232b5e4f638b6425d34aec74e5eb20c900d
+DIST asterisk-core-sounds-en_AU-g729-1.6.1.tar.gz 1089757 BLAKE2B 2ceee9c72082c7c015ec07f346ad62c36b07ca017c11018a70b27d63113a7b7b22bad2b03204d3a03fef4c13b62bfda341bb518e583fd8357de690825a701642 SHA512 aa8fc43caa18da2ed22f9add2474d2d32ba43c03f67566ab0e6f6119fe6ccddd228c6bba51d652b14f70220f8ac9e5a19af638abaf9f490ac6d82029fac389c6
+DIST asterisk-core-sounds-en_AU-gsm-1.6.1.tar.gz 1702200 BLAKE2B 94329734aea413b9f734205d683f587fbe84bdf071e881c2d927e7f30315b859846652ba159534a4c640f863eb60d84bf689e64cdc42f502cd537c59a01d0aab SHA512 cbefdd1dac4f578f484c042f54707499ae67b7684b33b952a1d0bb46ca56d1a5081acba2205bb271aa9f600783212ca002cfcf2e95f712e65f3be2e2ae013542
+DIST asterisk-core-sounds-en_AU-siren14-1.6.1.tar.gz 6375414 BLAKE2B 6fde6e4c686e4075565b5a3df949f806e21b26415df699b31f1ea0658a579cecd98173518a2da9a10e27180babed02bc0b9af3c062c2c573351925455298966e SHA512 a8de4b3fb82deeae6c222f754deb606c45f4598ebd98977646f157e4d2438d8e91a8da92eddc6b1791f0761fa96617edff43d072d1485d612ebc7db8a70a1ed9
+DIST asterisk-core-sounds-en_AU-siren7-1.6.1.tar.gz 4248602 BLAKE2B ab82e73e03994723a350feecdcba6914ab428adb9e78f7bcb8a2e9c661f446515afd0f74fa14831c06b291c9bddad5949a46bbd4e2eb6f8a52f384f71269bb1a SHA512 bb7b9f2749f87e1a576485e50ee63e1d16c06fc79163400448ea737c4be90769880cd2bf73c4aefd34a08c0f482a9e56b2c6176cd30f20c385cc6c2fa6af50f7
+DIST asterisk-core-sounds-en_AU-sln16-1.6.1.tar.gz 26129586 BLAKE2B 86ce1d4bc137ccfbcc50a9d9664d79245d62aa5f9055e0fdf9db2f83ac520d5d0284dd8f5f1d2b1016b3ecc21b549b7d9cd3e0d1c74bfb92c88772109fa660da SHA512 3e25620708063ead629804faa35e1551307e244811b17bf33d7023c5d71304ac9adf615e11b92b7d1ea32acf1857ac49a554d4ec13bb17e456e1a460c83a7140
+DIST asterisk-core-sounds-en_AU-ulaw-1.6.1.tar.gz 6983587 BLAKE2B 016e611d79c1bc8ffb62c888f97ed11ef4dd278b9c1da1c8fec84220efc9eb22c9be0cafe6e7ee32bded43974213fe84052788a9d575b0bc42a7bcf101ff7f0d SHA512 557bec456c0c47ff1c6fe82979dfed60645620b6bd6884e3b12b00e5bd1018309d1c6032b1a0b213b21ccd6c46ec45cd7f7437c2cb73a1f812965eed96fc55e2
+DIST asterisk-core-sounds-en_AU-wav-1.6.1.tar.gz 13048433 BLAKE2B 7158f79ad329834f7f9c24fa2348415ea11aa409cee8e505e932bc572bbc1474fc1d256f924505726d205a348fff4410df6e2c88a60eb9f8561730fcbfb677c3 SHA512 d59d3bbd7abe267a5d162575a98c5e02dc60f2bbc6087359dd2b78f03033c3d0fee071917658b6cb7c1bfcf5c1874e94b34a1886a7ff03e23730e5fd9993a543
+DIST asterisk-core-sounds-en_GB-alaw-1.6.1.tar.gz 9178643 BLAKE2B 4eee1a616db2aef4d521ae7e6ea381b10e8033497c2a445288cc2e7ebad1c9f1f197003134a8732d6a7ac8418c916ed8101154b6864a75fae0e11033fe521e53 SHA512 6c9079c8e0f060a4baf557db9350eda16f025f0e8a5d10525695ad2550b1f8d9a3b7b6fafe8a8c25d9e936a8b5c79b41148d22ec0aa30d79aa3a90fd0ee78464
+DIST asterisk-core-sounds-en_GB-g722-1.6.1.tar.gz 10373883 BLAKE2B e2f22e98276c6dad22ccfa4d7ad78aac7d889dd72a659935bed93d918928da0999431da7a38aa8272b13c0cc62b2f9685e65370ebe0ce5aad538f53c753fbb70 SHA512 c54f2641d48482f95caab1a47e74cf6478f119057cea1f8262a5ede5a978a6a5e921e4b494bebada93c4e00859d58513a0bc8a89b8d51c98b87f1daf2ba5a95c
+DIST asterisk-core-sounds-en_GB-g729-1.6.1.tar.gz 1525429 BLAKE2B f7be60bfc18b4b1bf3dc8f240349ce53c63ebb6624b829447ddbbc4eb714c7a0c0204c2cb6ccf3e8707794816352a609bc4508f24e7da8b6338de05831c8b0ca SHA512 c199cb7bf2c6bbc68f30c1a5a3802ad8d7fe92d6bb25cb74a16b16314f3ad30cec006ea42fec4bca4734442303a24606f5745af435763af2ba60267d584516b6
+DIST asterisk-core-sounds-en_GB-gsm-1.6.1.tar.gz 2394153 BLAKE2B 531cf2328c51af28d72f6fbe39f158fc48263c888d28f987f0cf8e9d41f95700962527656ce827a316113338b934eb3858232c4ee5e7988a7a97094a0648a42f SHA512 a9c815fd7f64e93425114c32f07ee1e4853e7a414bc605cae01f1777fbe95c09e4aa268249693af327bff3cfa24d9a6e38b448340fd5fab6a615b57728b2cf94
+DIST asterisk-core-sounds-en_GB-siren14-1.6.1.tar.gz 8951719 BLAKE2B e10cf9244783887b1b8b69c3137c94a0344e0edf12bfb467319713054e00b5a216c4595305fca342489c1970cef4fdc0a465c7252d5c3717b1c1c3452c5f9645 SHA512 7e6f3e7ae7ab59a4b820a02c7717d35b893b98b24505d5f6e5ae37947db93c92ec0b19161907aea4252b29425b6e6d3e1ce2237007afb532dc818ea9ff1ed135
+DIST asterisk-core-sounds-en_GB-siren7-1.6.1.tar.gz 5953256 BLAKE2B 9d4d86398a9c8cf54809dc98ec49d641d66d11b032cbb5c4d5b07106487a139e49f18a469d2c5b018b4e322b6f7330b97071bab4e5bf8f22e01666b30cd61bef SHA512 040a280ad2e38847ea7465b540b4a462f6fc76f950684389a287fe857d91c79b7f5d8ff2641f40f7c05d0d9fb6d8116b12aad173f7886c64320f64655d8bb9c7
+DIST asterisk-core-sounds-en_GB-sln16-1.6.1.tar.gz 37844655 BLAKE2B 4e545abe43ab69897d0ab34be65117a770de4735d2d270cf736c480d7768192ffd32ad2bcfefd02a2fbb85ab61773a1fcb4b498e1fb1600f3d8487c3390d03f5 SHA512 86eb7ad3ff76351a30ba13d1ea141ad3fbf05e31b6069aff04024db036b2795d012ae0b9402d6fe2de25f972da40b189f5f29c105bf3043c47effa19352dd818
+DIST asterisk-core-sounds-en_GB-ulaw-1.6.1.tar.gz 9673992 BLAKE2B 29284bcb5f9191f557c77c1bfed17221150bf343e106beb47f34fe125d0f033b2394ce60370f4267553719fe284e0689d5775c3b3c8c139787a003aeccbb51c1 SHA512 9139a8b16e1eae548f33641d3d784c44ea79ee6d5703b0ad64980277bb87592a2d909604f729c69e2f550bff1bd43df15622716f78e130cd4f6e128f074bc9e8
+DIST asterisk-core-sounds-en_GB-wav-1.6.1.tar.gz 18643445 BLAKE2B 1b3d19a95e5a144397459fa95dd702e242f2c9ea58f24009944dfb3e5f7ad2b4d859c16d8ffb6896a7289c7b78db46ed133666f253f1528fc54c5751724dee20 SHA512 1ec445bfe8a45b868d1290a8b0bb54889e37d5657432c0fbc5b2ac4f017b12debdfd033c6c399a2c42ba2ad31212ea77172358ddbff29f6dd1457aed727d32f0
 DIST asterisk-core-sounds-es-alaw-1.4.21.tar.gz 10665934 BLAKE2B 38bcce1715e67bcbf3c65eb0b09471fd1359082fa1a0fd2093593e78adf5b0bb70862c7114ec0ac23e9feac1fc01aa22d3ff835b87fefc5fdaf09cf5a9a76e1b SHA512 b0220ac2ca3e43649ecdd573b6c264fbbacef2a7007b8feb535dd8d46fecc60f735f2cd57a905f511b0eac90cd119c7dbc30ff506556c4d679de62eed1fc3089
 DIST asterisk-core-sounds-es-alaw-1.4.22.tar.gz 12153981 BLAKE2B 8165fd4beb7f85548b43cf3fab7f674e1bc7d70fd589923dcc85e3f8c1f049d3aba1a0c097a2c63de7e26af021b9502ffcb78e1a01121cbfcb71d09a655d5297 SHA512 ca7a3bbd4f4700e8e6fa058c6ce75f30ea823e2e9a27a06bc00a53e779a4ed5378af09d7cb508473cc0bd6e9f17e0ff90840a277aadf39a958573cbed2743251
+DIST asterisk-core-sounds-es-alaw-1.6.1.tar.gz 12774686 BLAKE2B e4cfc2fececa65181f6f598c82d9184157a8ce61feb849c63bd6857646247917e98dd647b4acfc14f769fb710a3e46d379ec9675b29f83fb0247ab331aeefc62 SHA512 a8b64ada57b23a86626099d164ee8cdb801c3cb1e08afa0708dc91bb9654dd5d28c298d8fb0c3ea01292a470cd5bb7ea9014b8d911367f807ee401c79ef02519
 DIST asterisk-core-sounds-es-g722-1.4.21.tar.gz 11104818 BLAKE2B 458d05efb2efc6772fc7f383eb80cc560b9c720ea61b6c24d43975de931785e2c57792ceb57efb3b0fe4e67d9a5540e7a7523e788bac234f350732766a453425 SHA512 25b1d63bfccf757ee273023637d8d9adfe5454a46fe6633fa806e0fd87aef1b148cbe24ee393da0411091ae17dd039215fb509eb2e92150aac2c1d82a6e2fd07
 DIST asterisk-core-sounds-es-g722-1.4.22.tar.gz 12519197 BLAKE2B a5ae929685df0b143610a64c89952d33ab60a1423453d8812ecd4b0937b052b4358e4492f1c7998708945b2aa8e72c2cbb0201d4dc5ec02fd78b689aada18025 SHA512 917b609de4214554c1a6db0d60403bd3f3c7e161bc75e9366eb8ba74f835a6b547a07552e56b283481dd71d30f3a7d502ddc3de43b6a61cef354f2bfa6690861
+DIST asterisk-core-sounds-es-g722-1.6.1.tar.gz 13175419 BLAKE2B 52a680d90371cb2e983221f7ba25a081a689aca6a7336ee8941f13c82b9e48436191a23427d6c10a0f7c7e346317d74f1f931698990172232d043b2d772e88bb SHA512 1da4649272d1a1713f16c55c7b8ea17f1c4d7f22ce6b734e5c36f2fefde4ac30d3704454ea2f399c1769c4be583fbe00dbb3c633b5fc10b6c0e488eb2a9d98ee
 DIST asterisk-core-sounds-es-g729-1.4.21.tar.gz 1541057 BLAKE2B 9e74f6ac49bb099f33c05c4d9ccd37c37bf2d05112877ad76eaeb14253fc858fffb688f7ba2d541c2628163b74fc5ce47e90bd30ccc9d62f2f2570a2310f0b49 SHA512 0988fd48d3cdb38e188ec47d52dbc3c67efde6b3ed0f12b7d0cd2b367a4f3914c8befedfd52739d493de75d82a40a41871014e990f767bc79055d2cdb1b4c46f
 DIST asterisk-core-sounds-es-g729-1.4.22.tar.gz 1771355 BLAKE2B 1a8bcea13aaf4c189544fef36335554f263e6784b5224558ec6098788246e977f3fe1e2837bb4c0abf781aed3ba48fd49c3b3704492aa4272cbe5e6b77f069d5 SHA512 9b8f311aa06233ab0d93cf1883f627bd59f44d4fc9afa9bf8a6209035dbd2194fe7d7b3ce2ce2ba5185c9356b0adacc569543dfec9939d3cb7fb3ceebb5c8ff8
+DIST asterisk-core-sounds-es-g729-1.6.1.tar.gz 1888591 BLAKE2B 684db948884c2d1a58931036b76e015414b525055c3d4269b48163d7086364afef20fdcaf897f8c3c5647c2380ca37eeb2fae228a6396c476c0a12fdcdc1dae4 SHA512 16aec9b5a2930fd57b5cc57321d1e371f8f96f527a2f09833f5e9180b80e05ff33db4cbbbd4f97f8fcc7edb73adff3c7171688a6cabef46e6ad88b622b6d5af5
 DIST asterisk-core-sounds-es-gsm-1.4.21.tar.gz 2479262 BLAKE2B 8cff8722db30900f8dfa490876ab8db134cf6e4aed112cb055637a3167288a757fb0cb17b5d44e3616dcc582090d184971e8b0f2825ede03fe4aa9146395bb94 SHA512 dd92f479e7726de0d093c51563cc3a98bce2d0d396714fb69fc4de16b0aafdcf09ae4387bf8cc5c080ab63fdd9790c23eec263da6f221455170ce99f38b4dac2
 DIST asterisk-core-sounds-es-gsm-1.4.22.tar.gz 2846711 BLAKE2B 75d8999bd47cd2504a3515020deff3125ae6efd98b21339678548ab180c41f46a302990e656fe4d9aa62c7721dd321d774d97e95275ab31fd56607d3002e1773 SHA512 39dc66b2b38b706eee002d4ffed57f1225c50c14ba037ab8979b49cc53810955cda4ccaf298871cc33348cde7a5579ce5190164cdb72aa5cc1cd25b534ff447d
+DIST asterisk-core-sounds-es-gsm-1.6.1.tar.gz 3029115 BLAKE2B 50ec8411d09fea2afc35f6cda867458e2c8f526fedfc6231020c09588f3f782ce613c2a14beb500e978dacdd702e1decc5507602554b9f636903352661b3d6b1 SHA512 e0d9ff631641b61e5cfac58f2cca92294fd4f5ec751920bebdbb0b8fc4a3916f0707f4f4354381795bfeae94d3978b0df45e87903fa04c3c6a3fb8a0995a2d9c
 DIST asterisk-core-sounds-es-siren14-1.4.21.tar.gz 9300088 BLAKE2B 49d323d5b31e5f1c0346363cc204b9653eed51628fff623ac7e64d5b412811fb011073e6eee461f22e47bb1df1bf8a5f7c9068f3b31e7c9ca70fa0bc643f0c8d SHA512 4fc4775bda935f0330eccbec3f46737309faf591ac179f3ebe70cfe0d9478675fb3d6b5b6ef95d6ebf6612b52c17146f2406fdfceb0df62e73546b0305217a26
 DIST asterisk-core-sounds-es-siren14-1.4.22.tar.gz 10668439 BLAKE2B c25e5463d6414ad96fac6f081494667e8f61e49cedb3e1cd906e258c63f20ae409f7a5d61b282c89c9aeb68c33e9006f14aef4782e5e12c06f51a468af62a352 SHA512 3dabb27e239a657858b73004501d8d4c19f176f361ee65cae9cfd0d49bd8f88ed40e752372c434eff9be5581096a4d1edf4de087368369c0c7f59af23d42c4c5
+DIST asterisk-core-sounds-es-siren14-1.6.1.tar.gz 11111921 BLAKE2B 0ec3a2cdd4151213e37f0077c63357af574d75a66873d50342796ad4b55853e60de0348d248f35c27a570f7c235a1c860620a5001ddfcd858f7815ed4fef2e10 SHA512 a9f64324623688f85eeccbd8633ef24e718b65444a08eb997cdaec24e6ba3b817ac85e2f51d7a5d6d5743fb543af91c89c253547cc56ec936058c9297eef76eb
 DIST asterisk-core-sounds-es-siren7-1.4.21.tar.gz 5953949 BLAKE2B 86350cf638b45d40b3d6dad3a3902edcb76443014e7b07a5738380c9df855eeeffe1019c7b62c0c877ac37bba6bdf812bebf7c90f51f323e448accb73efce9fd SHA512 4e508719f9e233b196609334212d023b43d5bca8054d378351e4599f06f6acb0251969bfd2ddad932ade6dbdddaf3cafcf2d4fbd15b7ec1cf7a8771c47fe02d2
 DIST asterisk-core-sounds-es-siren7-1.4.22.tar.gz 6856025 BLAKE2B 65877c775802909a76adfd16f6624a8b7cd1e6a5128e5f3f628b699b1517f163d35b589c93968b0b842a67f480f5f9645d10a8f7cc45c9e3303f867b2b5b6c34 SHA512 d179a17553958f8ccced6431e642885aed6cdee534d6b86e3087d1b8464c44862d40be8e27843dea21a7e556b91e8e475b50ff6737c281a961bb6eb352f2e65b
+DIST asterisk-core-sounds-es-siren7-1.6.1.tar.gz 7345031 BLAKE2B bd6de3b7944b4c61b4287a8323c241ee0b8da43f024987d8439343712caf0e95ae542c115ec588a7566557728588935733b02e1e075cb408da27d0eaddd5571f SHA512 ed74793735029b7905d6100032823a769257323283c6170e5e11edfa5fd92222b5e52fe280cbe001aad62acef708d7101c6ac82f845a8f1f04ca16a5068337b3
 DIST asterisk-core-sounds-es-sln16-1.4.21.tar.gz 43767861 BLAKE2B b73e2f76751e61b460335c5da906ae60114529ab4e486994bbac08f5f840bba9800d597c7d2028e3c7f743955e49663cc0c60f44a790c9d60af83314526dfa6b SHA512 27fffc9ce4a5f1ca245e697d5eb9548580b280816d13ed6e23d9ebb971ffb502b3a5a0afcf93324e6b5ae8a8d7fdcf8d3eaeac12d0e602f3f3ec20e464cd760d
 DIST asterisk-core-sounds-es-sln16-1.4.22.tar.gz 50127209 BLAKE2B 2921dc46a4f86c581ea70a708f1df4cae88c453294fcaf6723a1c2a85f23aec7d3df1da61ae28b5c986611ff8ee2469ed939389ece29582201eb217bf6dba63d SHA512 5598d04c2f3db13c67473112445000808a427ff1720cdfa223063d349a6256acb945cc724ccb4ff8f0bd1f35e271209700acd3f62890d78c2ce578b03bfe27df
+DIST asterisk-core-sounds-es-sln16-1.6.1.tar.gz 52462923 BLAKE2B a8344f83bb0db65e2a23d430d79ae92d27d2f7d0bfd623841b85fe9362ae705326b4c742c7299b32d76348d63db00873eb82997df94b124d376496af73feff83 SHA512 81f0666913a6d4dcacf643044f795eaa8703dad31212329dd0b347a42834b8206ac141ae089b174ca3647ce5a43499e9e263503920ab7023365ed12c2496aa75
 DIST asterisk-core-sounds-es-ulaw-1.4.21.tar.gz 10802067 BLAKE2B 52bc00c8386fd985486af57a528b73d5374db1a3c578a4593dd2aba926e1e295a3e6374a40ccb7be3ee2c001f4a3f29b65f623fc386cc746951945478a176819 SHA512 a4c9b61c69a4d075cb10ca557e4cc26792db4a464e94240eac809b4ddc31e050dc3de312577f1ca28a3b37a9fbd7120dcb13aa19f722d6b56e91572b59594bb4
 DIST asterisk-core-sounds-es-ulaw-1.4.22.tar.gz 12340977 BLAKE2B 2d75d8c2fc1579b45373b2ee508638b0c15ee6f48f19c8a5f44abf69f0f4da6981d743075d62043e5013fc4384fbd87171f1faecb3d80c7bf4620605e9e975ac SHA512 1abee9bca61a3f52660a966ec815ca1dccbd1c89ccaba070af82109a1e2c2e7fd75de28c48b569d017d35a1d2eff215a677b1bb03d86b8e7c5814db18363ad5f
+DIST asterisk-core-sounds-es-ulaw-1.6.1.tar.gz 13024983 BLAKE2B e801de0cfacde0be03f790bd2aa62e58ff5907e02b7ceb9a879aa7173be33132d869ffadfd9542e77ee8dea60838a7f94dce8d6c163c6657fbc559e15b5d63cf SHA512 d44332860af161297735ec00c2410c6adf0ee92b07533e94a11129ad50935fedd1d72a9430acc43bcfbe45417fe9fd3ad361d661ba32400531a91c4a61ee4f1d
 DIST asterisk-core-sounds-es-wav-1.4.21.tar.gz 21594568 BLAKE2B bdae3328864c48fb9c6804300c229cf76c6cb6308cbdc0d23720f533ae49114e8bae524a1765562a065f718588d20799ff6a299c80dfad8d4e014c8dea5d2e69 SHA512 b7747f3025496b124da8f496a663f2b5d6361987165927bb2eea9b6af623d8c2941cae627a5a8d7d8fa376a51f6693eb4000db0e98dea3c99cf1eed03735b280
 DIST asterisk-core-sounds-es-wav-1.4.22.tar.gz 24712090 BLAKE2B d277878f0a4cb3c81c0af7bc6ef8407ebda18a1df902492565678edaa081072dd6316a7c8ec59a20dac224afef658241c7a922b236d112de782161f8d3d521c4 SHA512 78278a7b5edf86992c9e98e2d8f94a55514172d58cbc3358351746d26aafcfb365321b537c167e0f102e1c52409245dfd932a7a749233d0af709724ac8ab8f28
+DIST asterisk-core-sounds-es-wav-1.6.1.tar.gz 25834855 BLAKE2B 350aa9a60e60eb7b16239eba12a2b511f684ebc83ca8671f2aa7eefa117c7ca858ec01a2d626f056287e279b7a483d296f44e8d41a4511b4de156e2487d61101 SHA512 26b56fd2d9efbf86611a8b4f00997444b7f98d54c2eaac043a56630dedbbeafa945c57f53895b6fad249d2f52f456997642469752a6e1be4e27ed49311dfbf6e
 DIST asterisk-core-sounds-fr-alaw-1.4.21.tar.gz 7802733 BLAKE2B 9ec717849a7c6b97824577f67c124615ec8b539ba78be98c9bcd1000d3675cb80eeea3c01abbaf111ae3516527be307e1fc72a02b32518711a640906ce523fd2 SHA512 af3415a0aad10ab011b193f0ee620340138f766e7c6a85bbcc705239400e044b98e1ff62648e877d961918029f92a21468eafe04f92343b2889698b275c01322
 DIST asterisk-core-sounds-fr-alaw-1.4.22.tar.gz 8813861 BLAKE2B 34b9852f4717e1312520e5e1df359fa72c9dad7f41721ff435552059cf4e40068615ca2db5235797203556ad192aa5704c0d9dfdcdd477e360df2afbc4fd9ed7 SHA512 312d30ba4ad56af3c3ea832d4d28b83a41f340ab14953e504fcf464ef95aef51b399961dd52ac3161675c2a02ca055f696f709a180982bc669b339ee4ba58e73
+DIST asterisk-core-sounds-fr-alaw-1.6.1.tar.gz 10225575 BLAKE2B 67ee4a7dc84a027f8bebc7c49bd2ada3f28dbbc581ad871348598846dd4c2cf8869c829c5bbfc2dda6b809f6c17efaa362ec18c5ce6454ae303787d27facce9f SHA512 b336c66156ac0d2653ea0eb12b278da6f73af82de8bfc0c722775ba0d1e167d88a4f4dfa1c905ebbdd874be90716ea1ae0a3407021a9adc1521b9ff0c8468607
 DIST asterisk-core-sounds-fr-g722-1.4.21.tar.gz 8576649 BLAKE2B 81f43dd98cfbe45f1945e68f826c6dc0b0e4e40886f0f7480af5bb27f9167a16108b61119b398cbf32831029796cd34c3fd4cc733e67159108b11bcf8a41649f SHA512 e42d58d0033385c06d75add961261ec9db107ff89c9324bf7d0c2b46bae10c6ce16f3d7b37af19602851baa1cb05dc5e89e17ec8ba7f87a4eb48d253b18afe98
 DIST asterisk-core-sounds-fr-g722-1.4.22.tar.gz 9467644 BLAKE2B ef3ec9123446a4dfa1898a6ca507b0d8d984ea387aab286fe131a161d9e6b14f93d7ef2e136e6aa7052152c12b9ae61427b8e094abb5589ea31bf2728ee3820c SHA512 5d28505e50c02687a8938bdc7df57b263f59bb9b7f196dd0820545fc104938f276bb5446805e766f230ad882576e98bee936d1fa03e6e3bf8cf2b67fff55297c
+DIST asterisk-core-sounds-fr-g722-1.6.1.tar.gz 10975670 BLAKE2B 6c58513dc23491b7fc267481d73ecb3fc9f6f8a9f230a2b89c5e8fdf5f80d794803feed8bebc5b80e80666119529d9e1df634e4788eae1a05264627dcd8f8c70 SHA512 a39766aa7a36dfca4d75eb7ccaa47a766da17f12ff1ed873283b61e51b081e45e5ec7b12d21ccceda2f87762abfe929b70cf07c7a0b8b9855dfb2896008625f0
 DIST asterisk-core-sounds-fr-g729-1.4.21.tar.gz 1201891 BLAKE2B a93c703d4b27f821d3de193e5c86de5a79a191d298ed81f97ebc34525c4ba6d13c04b44db05da64d39ad44f10311300dcd2b919a084d6200b837f7a12e8c2cf7 SHA512 61dfc376d0b5883d5f585b1988f55ce5dd3638919ccc706079148600699fce55b82b90ad59e00561701891f5132661add2093c464f8db6aadaca04ec2965c5fb
 DIST asterisk-core-sounds-fr-g729-1.4.22.tar.gz 1344791 BLAKE2B efdb369af819be66b31c5c10b5c2602c79cef1e04bef2b51c00ff80a6e74e6506b66ee01ddc9d6361716244a6d3757756639c7e29061946d0d1f98ecf292e234 SHA512 3bc498ac44995170c11ecb80d90ff3d871e3dd27974cbcf604d2eb6a3c59a5b560d48726880fa3999339c3a4be5b1324f3c4abda9f991fe28e3c683126aa30c5
+DIST asterisk-core-sounds-fr-g729-1.6.1.tar.gz 1590338 BLAKE2B f096a4b148248aaeaaae6af8c19e4a96c8b6af388b73929f741f85ebfab85ceda11f4de9fbd0889af5affd3b9269a522b252b50b0f2b6da135b2b52025d8568d SHA512 90f018efd1ef65bed51e843359ac621e9bbbabdaeddb0a06be4fa69f93f3733d59ae5204bb0b5670d1f1d4cf8584365206b7110321428f2173c8174e3d7e8a45
 DIST asterisk-core-sounds-fr-gsm-1.4.21.tar.gz 1897139 BLAKE2B d90a72e6f1564eb85f8eb7287743fa101674be061e87b5a304744f6abcfdda030139bf3ca85e4b13f8a8f43cbf3474a41657235e89b07d2cd85bebdcc8788fb5 SHA512 84d7b50fe6e215e1120193602c1fd54b94f4d9b7ef7262e5f5045912510d9e92e76c174de04d46b3545cee4c0225008ef05bfe52c08aa64eb71728fd84144a45
 DIST asterisk-core-sounds-fr-gsm-1.4.22.tar.gz 2128144 BLAKE2B 54c47b0c76121ae215be5bf3cdaf1546319de896a3c6b3e03a0520c1610646cb2059071196279ed4026858e5c036b5cdd7d067c5cd695f3bfdcd890cd8ea55e9 SHA512 1b96b5b8c25e57b0402af5267449579694283617a1c3ed6da9b6e12e30081577a1a79412dc7aca387097e1e57a17afb5246431b930587612bc50147c72e66f31
+DIST asterisk-core-sounds-fr-gsm-1.6.1.tar.gz 2519983 BLAKE2B cd7a49c2472119f08fec45f51683cdb16d375991056e7ad92c2cbb324912160db8cdb072f1ca95789d4990f9216c7c25af8b4f8849a21ddda327049f837c12e4 SHA512 2eca41bbf3347b58f3569001fe87d220e11c26189d2cc82ce7c609871ba13539e00b34474ff0199030c653aa1c32de0dd142e84b1a19c622e02df2bead55735e
 DIST asterisk-core-sounds-fr-siren14-1.4.21.tar.gz 7282008 BLAKE2B f26cf6b655fb9328d6e3a3a4498e015d23a9e9cd33c67c52742581ba2e0c1f6f08f5500af2d06ecf834bb2854bc2495671fe743df1e88308a4e314d366e29b46 SHA512 73e85e6174fca61190fea725926028da9e58bab2d2b6aba6a8e9039882ab7d8fdb3bfa7cf7d59039ec306c1ac85ede5695b7ac7f52e2274e46a4735fb0b88679
 DIST asterisk-core-sounds-fr-siren14-1.4.22.tar.gz 8140068 BLAKE2B c24f08b3bda7066119ab98a95a365f4b7b0ad4aa0301b1549b5c6fe256585cd84bd61c11d8f57bf22813f2f97e813bb13c3c43f48804104bbbba22590980f236 SHA512 e3c788acd43ddb95a07d607d7b5db024193575e78a188bd2a2b8e95f64814142686d3561c03d29114957cbbfb241d9cffc855477dc6153c3e9d13d6a912ebc76
+DIST asterisk-core-sounds-fr-siren14-1.6.1.tar.gz 9338420 BLAKE2B 1d89f27fb8dc50ac5c71eec1f06972f9c985a5ba635227ce75d3a16c2a5833b1946f0ce7b84e0b7b27dfec336bf2e7365ee9aaf8af4eecdf5615b7641232c8e3 SHA512 e53a9f8940c86925fa5fa821b77a5b61897eed8c83ec81c7ddec799807b0b06d5b95f7e5fd8f149f3bad661db432da6fbd55ec7fe31c1e858a4d7763eafb0911
 DIST asterisk-core-sounds-fr-siren7-1.4.21.tar.gz 4598263 BLAKE2B 27ea9b97aaed8d076a7c48d5b4904818c4a83e85740ba71b69f51823bf4aefbcfcc308fd02a419245bb8677a8a9e18c9e4d5635d90dd87ec9a41152e21644491 SHA512 3a7d7a9da2f0b15e6afe2621aa903a59726b9617cc56ca11748b2eeef65e6210b27adc45918d9f1690468efe4e0fadd04c2b6ab754cd2798c40603f02727fda3
 DIST asterisk-core-sounds-fr-siren7-1.4.22.tar.gz 5162570 BLAKE2B c244f9fd488d3622c9f2ca600f5551f5359e32d5d60f6831c1e040ef2471025ba9fc7334c586b03fcd9dc01e499b2462dbf67678573deb9efda87c37df3ce2c9 SHA512 3e460810efbce735031ba50653a095ff5e69647f9d08776d7d30ec4f3e7e9169105413619693fb5136903e68a488683cb23e51bf725d507d8c5cbdef046df61f
+DIST asterisk-core-sounds-fr-siren7-1.6.1.tar.gz 6150050 BLAKE2B a1d507d85a25fae62b59f547a491f23a87178de1238a0c6475ec4d95612f29c09b24fb8b185c06ca6c94c91a95bf6c0f57f533af4b5e558967225be5832fc33a SHA512 4d393347ea2ea05d8f9d5efb96b03ea891709d63448bc88c27dc12474e406626bf294e13a285deeaf0de03349d55a42a2021c08a7a48b51901514357acc587ea
 DIST asterisk-core-sounds-fr-sln16-1.4.21.tar.gz 32346434 BLAKE2B 015bcaebd2b53641bf764753a3f19a06041f5e763f914bd74d3758dc3408b1fd6fd71d689347f54e3c6e4068fd5bd61fa2f2317a484297025f9c876e9976d68f SHA512 53c0276347fd48b5fdc990909ef3db6f348bae7b88cc6f3f316f512304f8df5bbfd895e2188de8fa60f5519aaf1035460d8a1308a04a280f0031f14b292fdc30
 DIST asterisk-core-sounds-fr-sln16-1.4.22.tar.gz 36567733 BLAKE2B 1dcfdd1d200894452638d7163bed93c1d22e776e3d57495889e50528bddfe1787c895e92de340b72854fbf0b21ab7a3d1257b14a3ae68ead0e16a90e3f3d2849 SHA512 65f1422a8a120a2a14f549f5ebba8624f28decac3d1fb8a91a77988e4be021f542b53e785d30c79840cd89e48f97c45721c259198b89a87ca93455ed9e2ce212
+DIST asterisk-core-sounds-fr-sln16-1.6.1.tar.gz 42289032 BLAKE2B 68a22674f28141b5ecdbd4d9d383d7fe29ba5fa64652c46ad9147b347718cf84756058294d5e7b1805903fbad71d60d88e9a3b054af93707660255940510dad4 SHA512 7092eefc0a794d2869a894712e3762a79bf28e42d7b50e2f8f9aec34a332361d508a0bc505d1c664d5da58eb7cbcf31368748b11d0419addfb00501b82f23fcb
 DIST asterisk-core-sounds-fr-ulaw-1.4.21.tar.gz 7995267 BLAKE2B e90ea72a870bdb86af19735c9dd9b81d247ca97e355a081ea19d5f4e28493abdd3fce63e79d4e8f1253b794d15b02efaaa9574470501557e39ebfdea7c68c89b SHA512 261c968742c003274701296fe756256daed749c506d08afd82b72590a7df04641f4e20714f0c200500d0a3bf5724545197579faf954f554b2b902064e7ab3a36
 DIST asterisk-core-sounds-fr-ulaw-1.4.22.tar.gz 9027425 BLAKE2B 639a4be45f5982e040c8c8a1fbbc5a33ae0fa5632adef1345d495a7db78f9b96dd254fb483bb57e8c460d028628dd41c32e9b3035a6af93a17de8db63d4d14a1 SHA512 4d8b0c79cb950a84bd4b31184513a011d3bce6e4e80cdcd92775cd6b525bd8b51d309ed30106f8f128e8d076585485bbb9dcce770829daba060c1359e391455c
+DIST asterisk-core-sounds-fr-ulaw-1.6.1.tar.gz 10561959 BLAKE2B 78165fe9d3013c34e2a911aff8437112fd6de7fabe7fa83b8d59526f447c3d87d406df1bea3c8769b0392779a90b0db9e75921e5f8fe3dd62e7962728a1b92ff SHA512 25bd350ee442db6f715b1b647925e319215c91fb3876d1bfafee1ba18a1385abdaf789830a88cec545e5dba2dccd30382b13f676d97dc27f0518a2c0cf5ff0e8
 DIST asterisk-core-sounds-fr-wav-1.4.21.tar.gz 15858675 BLAKE2B 597f10e26ccef329560bbd04a729399e4411bb6335f2dd3c5dd72d0ea84b6bf240210baa3a7622e6d969616ff216c67867560a424be71c2e85d75e7a62400c9d SHA512 85d7a4b47525112352b620a05077fed2c84ad19f0e5046e4c05a292e0bf416c31dc10089c33588ac5b9f205b6efcc6bffe5c12250524e01219e9c576e0a9adf1
 DIST asterisk-core-sounds-fr-wav-1.4.22.tar.gz 17944749 BLAKE2B 581f589bd88aed4c8012b27adf01ac8f220eb884d034200f14b8d0a94b366038edff01b2fe4265ba577fe4232ad05a60ce8f3c4bbcb0597d19715be8eebec14a SHA512 ef954682f030ff186f9a006ff2af4ab699635184642af91a971a6bf162b79faa180c1ecab9fe3edcd8c987972b150b4cd35db8e631d4028ccda33025da9f636f
+DIST asterisk-core-sounds-fr-wav-1.6.1.tar.gz 20726064 BLAKE2B 0c0d5a0b397c8b750b569b44323985f21e89cc24299b4dfa29ed73db619f4552e36c8ddb34281ddd24a39fd4b23b0164eb1f7bbde89b2385105d70f8571a250a SHA512 04ee670ef99848c772a29e2a717346fe71e83291ca0b26cee9c68f0960485af15ba410dfba2c39b949b4d3963a73eb61dc377f822e10b44ea946e481bd88de0e
+DIST asterisk-core-sounds-it-alaw-1.6.1.tar.gz 9943937 BLAKE2B 8ab5c20b367dacea7912ace1f7b0b77a8c96b29b78ac786e2d663233292b0c4472b415e8a56a87eb6523e997999dcc704bbfed29341c9a32d7e95e8066ac8cef SHA512 5caca0c1c0b535ace144a3894b328d61034a88e2d5fcbca7ad6f87a94bf71b875e79672359066baa8164e988bbedbd22ac0850d9ca0b7530e3aa1a84c4d10e6d
+DIST asterisk-core-sounds-it-g722-1.6.1.tar.gz 10191350 BLAKE2B eef73cfb102eafb28e5d19881c3b8523c60c53f94cb7c60a1ee8a0a5dc045ba6aa147f5d75bd5e2fc758470b5e877b91dd5833d08cd9a123d252c5f29c1e6c9a SHA512 32bceb11b8b19cd841d042677a22c3f8fc223f3ef5717fff8380006c2b021a5dc2b1641be82cee70cb18f5780ae9573f4749a4942123fddf676e99e0a0872328
+DIST asterisk-core-sounds-it-g729-1.6.1.tar.gz 1465019 BLAKE2B 6a57e91556d2d6f5dc208b34f21a72ded95280faef9bc52caff007c6a422d6150f6a778e0cfc45a2e768240cd1cee222d942f8e1f04d4540e6e882e0d06b782a SHA512 8a83776d4bca63bddcb2d4055f622c1be29474cbdda2ed88969db4593f63dd97f6bd5fc1ec1379daf50edb344e4b6a1ee37c43eb07dd36177fd7228ed7c19fff
+DIST asterisk-core-sounds-it-gsm-1.6.1.tar.gz 2334452 BLAKE2B cebf79e69121782b2a064f21d5bfde0f13abc8442b18968b745336a567f053bba26b22c8659525d73358235a7a6cc8e7388296da6b3af833fd02eb69d5e38d15 SHA512 5649a8d82cfd84fc3b70c2256a4f10ae09e935df7c603d101dc1d9d797d0c7fc199d0ce764175c8c6799bbbe237fdc23fdeb0c93488d07ce938456214f7f3e1e
+DIST asterisk-core-sounds-it-siren14-1.6.1.tar.gz 8569071 BLAKE2B e18300df0f946fad033d069f4ff72c87a7da824390907ff2729f293cc43bd3323216f661ac0664d49b60f84e969754c47fb20c70e308093821a5a568fbda361b SHA512 f7518ef23f168db853f4774b04e916d5dbc79de656fd19558955114d176607d91521f42d2af90daa81d42f3c068f75a6fcdbcd28f086a4a864e4bbc81a23fa56
+DIST asterisk-core-sounds-it-siren7-1.6.1.tar.gz 5681669 BLAKE2B 73f90f007fc2d1007df27aa9930f920dbcfce048ba51eac8f455271330dfd2f80377e8b056e3cac1332b778bb3448eb5aeee8cc9474bac087f5239dcef93c46c SHA512 27aad85545c78b24e9c6c24cb2c540d8275d773d7a2cad8f3d619c2b845ccbe3f89652ec742aaf011ec0f0ea8520419abff5b4076c3db3f2af2f35d39242c15a
+DIST asterisk-core-sounds-it-sln16-1.6.1.tar.gz 40242723 BLAKE2B 52bb826f572972073ea533044dbcb65716418acebd45e81aef0880ad44503f4faf3cb0be76e2388ff855a12203989586b40928ec994e729820383859023535cc SHA512 5f9e1f8183a51355b6942bec486657c40a8d1632eeddfb4ff3819948c6ab9826a4f31956a1d9ee564c8f24cd292261d427ac64ee9015624e145f338f877b7cd8
+DIST asterisk-core-sounds-it-ulaw-1.6.1.tar.gz 10166419 BLAKE2B 7c0751fc7f931a9affbedb98673b1e8af271af2904eda262d8013f566bc978ba9bedbe2379862020c2fa9d2248e149876a47ebfd9e3bc10702255f7ee75f83b2 SHA512 8454e24555d4564d6358d52f7b15c8d3d9fa62e43b21299acdce69d11b1e60bc90b11d2441db683f562a78c655c77d12b49222c518991a500f7cd8107034ed36
+DIST asterisk-core-sounds-it-wav-1.6.1.tar.gz 19756185 BLAKE2B 16523037964394060e875f99c455221524e4c5d8e9105e6f23c54b5ed0f69bb596625932848f5e9e6ea0334db5a386a4b99f925c10bfd52232aa0bdaa1d73809 SHA512 db4495f93d307c13a131b8d1b70c3f59a999dd162f8338c594761affba7c8b027390397a84d365c7d550d04dbd66788233bc76cf082a5c91aa0050debe67d8d3
+DIST asterisk-core-sounds-ja-alaw-1.6.1.tar.gz 9824458 BLAKE2B 0eb129a10d524563e4a16a5b2085e5f1cd4a5857ac6495e6a4f2198b9503ef655782c7cd29bfece220d24b7392c9e2925869b3592c72dedc1cc6eaab137b9a6f SHA512 2a1c6df98c8f7231566611e48614f1e3b049c236bd62e11e2c9917844fea6dba8c93758a14121bb0879cc07560740da18a12f2547cf09bf595c722d82ac046e3
+DIST asterisk-core-sounds-ja-g722-1.6.1.tar.gz 10887772 BLAKE2B 6caa7d314a9c27910474258e3dbaabaaae9d77cc1e7c3614ff58980cf47a8a6d290ca5609ff2ac4402d4170e75a1e674f8ae362f788a45b2e40e53d054c00a86 SHA512 2c20942b43a01f37793c2893b8345fb4c416ca5b1a3040860ed007a02746d8f980c86a2cca45bfe61d7fb59d6f1cb0d7c66e815f674e8ef062397229fd790717
+DIST asterisk-core-sounds-ja-g729-1.6.1.tar.gz 1582654 BLAKE2B 5e81861262045986de72e219542aee9202c726a844f6bf91dc12718f770988d1b0da15730140a3fc55d7735511ab72b526ceb0faaeb1ccc7056c61774c061795 SHA512 f8ea363954ff52c676b7780d3387403039307b488908013565cfb22019c39f47df36031fa085639eb7e8999f2c32a9d8c738c826bb46e64ff3487c0fe2da2035
+DIST asterisk-core-sounds-ja-gsm-1.6.1.tar.gz 2508357 BLAKE2B 28a35be921d18854b9e044383391baeed4fa081584b8e9ab4f14b5838e3c46a00c832dfe9a749c465be96a3243b74a8d5962d8515fb855bdad0c88fcbcda578a SHA512 cafe0a758138f83518eed9ec8589dee7db7e0d7d6d069d6a613e8366327a3d08598f68f32a79de45f05241e20b8f5a66f19149abb04b613e8db133c87763a487
+DIST asterisk-core-sounds-ja-siren14-1.6.1.tar.gz 9181731 BLAKE2B 09b2528bb422e3fb946446bcc04322725fb6eb687c4c70be2c14bfcdef198005c28f4b62fdd46939f036c8a8e4ecb320ea52bac1c97d55a821004d5c2a57dfa1 SHA512 d6678312629a37c8613172ebd1c6ee30af3758510c59754d33f4b84f9cbc143506546c4d929fb9c327a527775f759977efbf13ce92e07962ca2d1aed4ec71727
+DIST asterisk-core-sounds-ja-siren7-1.6.1.tar.gz 5913448 BLAKE2B 5c62dd8986ca2b04e20484ac81ba2f5b011c0a5b6885aa6181875804701fcff6457fff6b50880db0a80130ba953d630c13c8bc2092aa2ec60769e6df22f42c38 SHA512 2343e5212e9e86c2341982484e1c099fe8a357ff8517caba802d33dac7eed40839ad79156686fe1ad2358ddd4cd6e77abc56d0b29e18010f219b2cb191c68d2e
+DIST asterisk-core-sounds-ja-sln16-1.6.1.tar.gz 40965363 BLAKE2B 7bcf73fe0a00bdb95ff8d7944e1bd8bf9d287a98a204a7a21378811faa63cd0fd1b7e5b238d69a330e377b46b2e1bbbf76b647cd7b26d1a46bfc86bb4a7f0ba9 SHA512 799e73c613da0645bf0bdbdcbfb5dedd82d5ecc743ceec1f805ec1266f322bef1a53883813d1b03aed1e1990962e999089e63bd186a8fb3f9d5118d22de1bb34
+DIST asterisk-core-sounds-ja-ulaw-1.6.1.tar.gz 10321427 BLAKE2B f7e7e9f7ddcc3fdb90c8a714e5f109f1a6c4c370b6536a88488726a1a7b0361483aa5f65e95812505e24f4902e4e518759638b3bd4cf3b7af360604f8e14aef0 SHA512 1765a8e0f23ede2f3f350f24ca981072d2230cfc5bcb0b7493f6583a4b7e6e8d8b9822424c37f821b34f49b0d51c1c660052e025c52f49a246aeafbe157db241
+DIST asterisk-core-sounds-ja-wav-1.6.1.tar.gz 20475859 BLAKE2B 38b029bcd47e3075e00c938837004992f483ef6db44f01eb2f1010cc1e12f1918824981fac53c4daf551ab0a644aaffc21ca42b35c805ccbbe5823e6a362a02e SHA512 640e9feb6bef228a22f140e544d869e45ee28c7d226ba5480bd4f12884c928c37760ce6c89929524468628ca002bae6b96bc762a46b65af9aa69e6fe5d992bc6
 DIST asterisk-core-sounds-ru-alaw-1.4.21.tar.gz 8064249 BLAKE2B b8e5f3089bed3b69ceed835b09da27d124b9cd1bba3928c573f066261784298c01396c0a6e3e16768f9429eca21b9255651b226c605e33e1030e71bbb3915042 SHA512 dbe53282d9c7498a6c310de8177e6354ad6ca92d6c105740a9cd938ff7c72a7e39ea6ada43ea9b271abd4815f5fe12b65ba60ded3f4cac6b75b383ad1ac3ee63
 DIST asterisk-core-sounds-ru-alaw-1.4.22.tar.gz 8152975 BLAKE2B abd1a77b70ef2587db0d4d5f345c17b66c094a9e7e1f4c763dd013ed256ef0f05e3360a401927a1c3220cf0645eb4e7c6450ca8bb4198684da300de3f7c27b0c SHA512 5d728d7b2d96e05479662c6517ae3314a3edc7a3aa0e24835a8f1c9da3d371ded61b0fdb663cc281b59b03c14eee193948bf653a9336baff386045e7694d451e
+DIST asterisk-core-sounds-ru-alaw-1.6.1.tar.gz 10258030 BLAKE2B b94e3ffa735a10149e31a4b1990efd80178f4eeb96efd5a4fb58b28f1380f1ac5a3f3df5497847c0a5d6797208998da853550e5d9eeda8c5de2dd2ff14e27757 SHA512 6f0686320e800662db62990269f9e5ea2a9631be077605b975730526986122d4e0679eda8b152a07bc5b421bf94ed737e54593ae0d65f651d7126dd851b95cc3
 DIST asterisk-core-sounds-ru-g722-1.4.21.tar.gz 8595025 BLAKE2B 298b3d84a4057c2ee12648a648da7507cce1358b727010c658f7d431c68299b062f927b728b5337a95e02fa03502b7fa53e20c35a0a1a27feff3927a7afb3b16 SHA512 f4c6b686e9bd377698cfca0f65a39d60c422f76672e275dc059912eebf9bb4d3e2cd8247360dcb1927726ba54e84c37d8c2b1d5cd82f660fd9a983f64052fb12
 DIST asterisk-core-sounds-ru-g722-1.4.22.tar.gz 8674954 BLAKE2B 31c0d624087716bfe33eac82a28a4a2412313931236e308933480421726f414e2a532a79c45370b1be778b01197755c8090b422f862179d6097d5331fb5575e4 SHA512 847d017656f676ddbbb603b32f3313e9e1f284d533a56850bed6ef3cd55c55383a9c11687f7af2294cce69f8126ea9b41f7b4a33d703f3b44ad5e119e47f125a
+DIST asterisk-core-sounds-ru-g722-1.6.1.tar.gz 10635740 BLAKE2B e17dde9322f8a3112e6e51c77cd528ec76a478af77affc483e7eb0c355839c27a74dc965c6638c7b0e0de7814ef462a3e77f0578b224a99d1498f3b96f4c10ae SHA512 e2b8cfa9e92a5d7cc82f759de86b92cd96c277b1188346ec488ee3f56085d251d3291feadc6503d8a6dd51b8d5b857101e7c49f6fa7848f26ca696a1e15ea6b4
 DIST asterisk-core-sounds-ru-g729-1.4.21.tar.gz 1213557 BLAKE2B 4a4f627c08e338e46fb5c77db109076253319ff245057ad45dd30e26ee29cb8b9cdf6d9884a01151b08a974107df6eb932f3c0d25f9fc021551d526016dd716b SHA512 b2849e947d6263c9c756c8139a28fd70884ea70ac1e1ac90743ed83a3ac033ba829fd8d49fc5cd178d9742dab3493d1c98cfe6a259f2963358c0ff44fd05e41b
 DIST asterisk-core-sounds-ru-g729-1.4.22.tar.gz 1284150 BLAKE2B c7f12ea12a0dae57ba38bb97fc8f6b585fb3705de831953ea4d592ec2c34aad2ec42d183c390d4f9d5251ef4952b73fa7628bc3f49eba0c5e01a4750e8d46f88 SHA512 0403f670c8a2138aa99671eba2e9ada956947f12661266d5c1ca25235caa03f7237c275d330e87cc23b55fd58a4bb2bb5a9a8bac4f56b2b514223e00164fb84b
+DIST asterisk-core-sounds-ru-g729-1.6.1.tar.gz 1523517 BLAKE2B 6e20060953b9837a1bd508cf9d5d08f2546163e5d00e9b2ec0f90cf56304b68170664032483bf566ef7fc3517646b893ca80d1b4e31bdbce6e8379ac2c4282db SHA512 e89f7f964400a45ee44838979b2ad27357ce187f01232eb15d67eaca3affabf3c4e99de720e7f2d35ae851698aa6e4473eb263144904e39cce2092fe2feded8f
 DIST asterisk-core-sounds-ru-gsm-1.4.21.tar.gz 1940666 BLAKE2B 3dfe5b77cc48554be7181eab73fbbd470764946145b142d66d2039e1efec671555836396bbf5f741405791369438a49fa2701b1cff25255ec5a90171c8742b65 SHA512 788c06ce334c7647acd4e7e46f7823c96631778eb7ac45481c103006e85dedd6f6c8df3a0fcef59449d1c8cddd44ddfe2c70ce671147be681b8d91cc91398f2c
 DIST asterisk-core-sounds-ru-gsm-1.4.22.tar.gz 2037430 BLAKE2B 76f4c53065d198509815cc0d8df415288167542518455d8d7a9afe7c4df6c054a7c7da5dde3d1bff2065a1116aec98cbcfa4baac0bd8445e8013cbe4f14406b6 SHA512 397dd7442fa5416e177da520a366a30d8adcbaf0d2fe4c4d4a9540138a09a49b023ead609539d38889666f0e2a47bdfbf6bed26e4e1605ba9bec45bf6a073a13
+DIST asterisk-core-sounds-ru-gsm-1.6.1.tar.gz 2432741 BLAKE2B a4b2e7a849a6f99de259304b69156f761e199ebc1487664db383f6b5b3449392c63a7746aa607d0770ff33753f72d0507f6279ffa70ba3eaf55b9bf744f20126 SHA512 1e12d301bf6903ea557a53426a9139331dc621a5e91e1799235202fc3920b16e09f5596503f230d01f27ee60bf8b980719ec6c6ac2b9f72ce5e990196a9a2b1d
 DIST asterisk-core-sounds-ru-siren14-1.4.21.tar.gz 6958245 BLAKE2B d2d7bb0a4f3385a74bbc78ae206b1e16ab7152bddd725c571ae541c09feb82b2ca97caabbb69fb3b2df278dcfa4bbcc7d49238537fec1fdc717199dc73868633 SHA512 e1adf1e25b63b4cc75f5b9d26544fbaf92cb32c16bd8506a24227cbe61bb8cc1e00269c3859b2659f7cc85a996983520b64d069dcbfcb35871877d11d74ecb53
 DIST asterisk-core-sounds-ru-siren14-1.4.22.tar.gz 7294734 BLAKE2B 58338b8d0abc94837597db110b7e92cef5bac8f6356b16323ee4800c11786a8acf5ae0c598f92763d1c8e94d414e522518c31afa04f86147311b7d1c222a4cf1 SHA512 23717a75f41231ca86d49cb558f78c17de516c0c7ed921645b8991b0ca4a29607ea18a2af89fac351824caa081ee130c5595f8a704451e911025349d9c19abcf
+DIST asterisk-core-sounds-ru-siren14-1.6.1.tar.gz 8902549 BLAKE2B 58516e14cc90626e0d8ad5cfe36360a04069f8134d85c5f9af1565a3b2669bc8ae6ae5185c31bd6892f8d2ab76bbe7451d1622c98bd244a2f19ecc9250262b11 SHA512 9afda5c9836ac490309016090d84d8e6feebdb59ecde5e640272e321ae231788c54063361e12776f0858dc1b87c32887833fadfdf39b60020470ce61a26e4571
 DIST asterisk-core-sounds-ru-siren7-1.4.21.tar.gz 4717552 BLAKE2B f93e4e2153950e23c003b9e8e2de66aca12fe85dedd178213837c8027a74cebb627b69c202c0193a64b66404ac2c5a1e96a3cd49a2c46a8fe934001b0e490415 SHA512 94e431c0c6385cf53922fa403f30b48fdd0988dadfc9175dd57ff7959f75c59e5a377006e43a687b01a18d547d39eebe542898d53f694077aa12c4d5329440e0
 DIST asterisk-core-sounds-ru-siren7-1.4.22.tar.gz 4965841 BLAKE2B 7a6a64bb04f0533fcc35a1d1e5ecc96ad91e1b254f63aded370ab0122129895175afa9014ad1dba03847dc1cffbaf4762eeede663a3ef2758ceb4bfd965985f4 SHA512 dd086a8f71fdbab134d8eb759f60dd0d46ea3df0df15a02a53be16206aee55f406107308af12565755d1bc2f33dcbc6b213f4a41a21b5c40ea0e1d3d34d71e40
+DIST asterisk-core-sounds-ru-siren7-1.6.1.tar.gz 5908733 BLAKE2B 86dbc76a2e7feff060c2287c2ab7db691679276a2fa3dd69948a0ca5cbb32cfccbc22fffd35d93b1066fe875f6b7ccaaf9ea98310b74a2d4ae4513ec3de13104 SHA512 2ba5e6be66e1eca00253be159c6ddf3dd43d1b79cb7d2a682dca80d75d22a64a305ee09690dab1748cae07a7e48dd7862da0092a601fd50b584d2ec0ebe0314b
 DIST asterisk-core-sounds-ru-sln16-1.4.21.tar.gz 33125360 BLAKE2B 6f3cd7f4e0c267d3d856dc936d0bd49fd28491c3fed51c48ac1fad4063b09b4df03c2f0b0af27da5b69e00b4be1a5f1e9a30fa410100cf899cf27a008e4528c2 SHA512 aeb3cfe6427db34e385d5b9033c73f8bd072c4bf37cd77bf871c3a1db199dbf1f4315a580bcce09bd511e2ed6da3c8f1073c88b5f9b11707ef54a56cf68e3051
 DIST asterisk-core-sounds-ru-sln16-1.4.22.tar.gz 33592783 BLAKE2B f91e13a8bc0796fdcf2a976c1e9fada1692d1abe709f45721134196c08cbfb97dcaace57d6d1ffc7992944b61de0cfe2bc7ba9186cb30164afccc039ce6a8bcb SHA512 edc22cad80be0de9aa2cbf1ac4e8281b359d53c0d51d4fbe4de09ad04457d7b489ed01f249e9de8018932d5de454405c71afb0b7801deedb24cc46d1fa717b9c
+DIST asterisk-core-sounds-ru-sln16-1.6.1.tar.gz 41377743 BLAKE2B fb41b48db9b557f7d8a570921304abca51bda8eedd4026ed8aef6d16c99d559898f2e26a1a1c308e3a83abac629a36718a22224b5442810b1baf6ecde101bcff SHA512 f2075107c3da628eb49bab31612316280917e6b7dc88450ae2aae87d42433a7791f797b7e8165ce11a1049cc2bc0db4d0c3396bc78580c46789781ac33d014f5
 DIST asterisk-core-sounds-ru-ulaw-1.4.21.tar.gz 8299885 BLAKE2B 849acbf583425e1b1ea5a68eabe07258e49c1ae374fc1241c4c4301da6a17e58cbde1f7f796bb98b631223fa6d3ab22353909ee25323ed5788888a63ec01ad9d SHA512 badc09410ed34f61e067246956ace20fcef76f55ce1735f0343e5d43fdfe523d58d7217cb1f09fd793350fb33a7d10d00147c8fcaa405e45a27c2ce2575bb3e9
 DIST asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz 8460881 BLAKE2B f9c6b4ead0a31cace57517f72495850313732e5d2032ab40b0b63bda153feef305b7f059d55333ba984187952364b4464604bff85d91b8c9fc05c2792f92f15c SHA512 f563a50512e43a9b8eeb926588638698fbebfb7799afd33c6218f42c424cbe0a983b4e7fd466624e5ea43dc24519bc770beeb64fe74c06f2891cb8f39776de2a
+DIST asterisk-core-sounds-ru-ulaw-1.6.1.tar.gz 10554068 BLAKE2B 6a6106f36b55d53bd36c7e038ca3797bc82192ef294181f53cbb47e231f0df5e2e4ea9e64114bf13702bd913ec38439cf0dc0feb78d521ad4142c903f8272414 SHA512 d1ae85fd1bd224585b3b0c9978ac7f94b56a1d58c876f60c3faf146d95fd948863e9988d8dc3ea25b2ed11e4bbe39276cd971f42288c264256dfe5166444ee4c
 DIST asterisk-core-sounds-ru-wav-1.4.21.tar.gz 16446330 BLAKE2B 8c09a8b49f9de856eda58c22bc86a24d91727e19f2a1fdd33c6428ed769df492a5e7e1c93d680b06db4ee293a7a3031b786f128fb917e6f326b57fa0d9d87233 SHA512 951a7b156cf7f92e9640f6704bd12013d73d688aaaff8ab18d15ea0c99f10fa0386e12b65c086a02536d8cd68c372c686e4485cff3afc4f40933d14bdb41e109
 DIST asterisk-core-sounds-ru-wav-1.4.22.tar.gz 16591836 BLAKE2B 95b16e2680753c2b141f6e5a5b12f06e87d6e2c998d941b9ea8d3e1229d8efa511b59a2aa5d00ad4f39ef0acc69953e933878cf60763c3f3daecf8497150bf41 SHA512 1f8484da7975bd91b38d8354ec84110892c42b44d2a0cbcd9a2d5a3756e56e0446d388e0e9343be8c3561c4a02cf55cd135d86051db5b4d232575ae4c4b60d1b
+DIST asterisk-core-sounds-ru-wav-1.6.1.tar.gz 20347533 BLAKE2B a06ebc2af7d19dd21ba9425fe535ca2568b72ce0b73879d464bdaf11387310393be320857e52edf70bd1ef5c382e161dd474096a60430e471c6890015bf6d478 SHA512 fbb5d99f2100cc51ac075409e7e321fad3c21c57cc6783fe90484e5a12a7bed559cb314abce49b41b2e1841b005c5f5e0e44ff3deed38bb9530267def113548b
+DIST asterisk-core-sounds-sv-alaw-1.6.1.tar.gz 6770356 BLAKE2B 93cc4420e7eff648e2db378617ed7ce846bd624cc6a487811ec429f8d5f42d7eca89b8072657053fab1e3cd5e28f3f9fa3e8af66d8d4119624a5ffba77517f12 SHA512 0f7449306ceca02a955510bfb9ded72eaa4cffa9020be5396a52f196bf892210156a8c6bf69ce625d2f31a3b7556694eb6806c70305ad186db0e103aa89497b3
+DIST asterisk-core-sounds-sv-g722-1.6.1.tar.gz 8743479 BLAKE2B a5d5277733e7ab70d36a7acc2165c6b9bfda0adbc61a8b3946ed5bda7ec6b13d67a7dd6d162f80d058e01b0184ba236a961d6ab81836a0f2edb601c96f5d666a SHA512 493265d9838b74e2a34b99246d396a78400c9671006b4d5eae83da87760af4026f97577757b497724ed4d065a5a179f0260893d54ab808d225ad2ee2326b48db
+DIST asterisk-core-sounds-sv-g729-1.6.1.tar.gz 1336614 BLAKE2B 085ff8898683276b1dbc93ad1212e76c1fe0db3ad24acb218f27f21ccab2c7193db69d37628857a093c9dd1545a4647bbcb954b88e4bb91177edeaddd46364ee SHA512 2b2774e9bf325930b1879535e0222f12b56cd9be408221d7c84f16ff8cbe281b2bac75c3285761b2b729b636657e687384a7d5645c1fcd4d6cfc0e96189c328b
+DIST asterisk-core-sounds-sv-gsm-1.6.1.tar.gz 2033375 BLAKE2B 37ee069e8cb7e7a6ce0175f43a0b8f37579b9c682a5e2a5ce451de0ef056069d7764e9823f0c1281282cbe1bbbf51126f97f261be45b2f457a4e633bfe1df975 SHA512 0455f80e530ac176a40037846e7f17b32efea81ecac36596f80f92f451560030d2861d4d4d98a1999dcef1dddb21044aad528afd77358e95d3ebe0677c3c777c
+DIST asterisk-core-sounds-sv-siren14-1.6.1.tar.gz 7799738 BLAKE2B a5a93b2f1a3099036ab65dcd68554f70a4a053afc1edcb683d53c334717ebd1b7123ff24282aace5bee4c10c394f6d3f10115322625d9200a0f9a8388862e3dc SHA512 5e305ae31f00ed097a0830d8bdde16895d67495caf767b13aa55a0bfa0635230974c9d7aa07e382b226717b298723de5b5710d8eb58fe0ba0a2c36297e656bda
+DIST asterisk-core-sounds-sv-siren7-1.6.1.tar.gz 5205073 BLAKE2B cf05233da99c7bc593785e303725dc4955523afcf79ae3c494732d102f8506dc29f6366fdf726fcbc24e07e600c365ae86ceca17ad26855f080833551846fd57 SHA512 fbb49c0bef722fd7d1568a1d5544d5e8b14c2a06dc9b6f7bc3701f66caa30036d7423ee0da4567eb4d2fb141070aa43bc3d4654f6829a63efd8779532fe49628
+DIST asterisk-core-sounds-sv-sln16-1.6.1.tar.gz 30557672 BLAKE2B a656655ac958edba15567e5a31c5abbc1ad39dd59e599e46b900b6fbea52c1d6ebd12e4b73586e9c142733d1a01fe4240fc44113527b9437c5add59702a9a4a1 SHA512 8776757091fbb8f8fe5d73a3d5954feac23dbed2d05281ce01fdecf3d75a12c89405945bd7ff47ff3d50708664f61703a63e97e44b73684ba7bead308d7bc985
+DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43ade6019830aa71c71855e773c5998c951fa7c8df7946392a66b02c50e6d4bcf79bf25b7104788b5f1b289cf95785cdcb9f241e12df280e1b SHA512 0b172986f4d07572ee098370c2354ecc60d3473d62f0b6667e48df005b234991a906fb84ba7c67aec8fe6bbeb459ff58a1b3d3d9dcc6bfc08087fe62e799f0aa
+DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60
 EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
 EBUILD asterisk-core-sounds-1.4.22.ebuild 1853 BLAKE2B bbdd6efb432a829f6c3408d5b72fe51bc2758db0800a660d98c6cda8be15af82ce6ed4026ce1d73bdc8de442e225505bf2b598d378a4c7de7822b3c12ac9208a SHA512 b798ec930025c9c5ed86a0c911da5403c57c015f1fd92dbf53e2dcd6c79e951eac4d02692b874147537a518b4d3aade0aec634c635f506bbac75876390d95194
-MISC metadata.xml 846 BLAKE2B 581e9e2325c925ddc9bffcdb3d545e2dc5d862a06bf79875eccda7d18412e24dcf3ac4c3293474225a38189dd534030a5d5095dec992dd52c0798b4287a6a921 SHA512 d09b435f10066acf15bb1b6c2454e4a207e7604eae199958bfc9de6f130f4f3380af5b3d95d686cc20dfabe38b58f9c3dc308517b63f8ff6675779b97ef471d2
+EBUILD asterisk-core-sounds-1.6.1.ebuild 1918 BLAKE2B 3fc7d2338255e46b873a530b1faa0695f141dc973067e424a32ead733892c5cb5c52ffe3e8219e85343737c3302553f5ea8a0abc7e8b7d8bdcfebda257bfcbce SHA512 ceac6189c14a623eee56c1095f01c6f038eaa1820a741c2fb2843c92dc9991864b5d01faaa0060831af7e56a49b0acd2e1c5c345338d604c4f6d65cfd7d9d702
+MISC metadata.xml 958 BLAKE2B a0bb142f5343679cc734d2154054fae0a93faf3cba74dd6a0939d37b1acfd7dc0c41b1aa22bc7a45e408b7c046d31d9c29ad9d5f2869d7e6c5388c10bafb99f6 SHA512 0665a156659c7b7199f06cca2a2d9498ae1230f65e850b92b2d8efd56550671c6f1932beae53b27ddd145133dae067e0fc0dfcfd264ab251de17f2bda7e8d3bf
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1.ebuild
new file mode 100644
index 000000000000..7deebba58f17
--- /dev/null
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Core sounds for asterisk"
+HOMEPAGE="http://www.asterisk.org/"
+MY_L10N="^en en_AU en_GB es fr it ja ru sv" # ^ is used to indicate to the loops below to NOT set this as an optional
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+IUSE=""
+for c in ${CODECS}; do
+	[[ "${c}" != +* ]] && IUSE+=" ${c}"
+done
+for l in ${MY_L10N}; do
+	[[ "${l}" != ^* ]] && IUSE+=" l10n_${l//_/-}" && SRC_URI+=" l10n_${l//_/-}? ("
+	for c in ${CODECS}; do
+		[[ "${c}" != +* ]] &&
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" ||
+		SRC_URI+=" http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz"
+	done
+	[[ "${l}" = ^* ]] || SRC_URI+=" )"
+done
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}"
+
+RDEPEND="!<net-misc/asterisk-extra-sounds-1.5.2"
+
+src_unpack() {
+	local ar
+	local c
+
+	for ar in ${A}; do
+		l="${ar#${PN}-}"
+		l=${l%%-*}
+		c="${ar#${PN}-*-}"
+		c=${c%%-*}
+		ebegin "Unpacking ${c} audio files for \"${l}\""
+			[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
+			tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+		eend $?
+	done
+}
+
+src_install() {
+	local l
+	local pf
+	for l in ${MY_L10N}; do
+		if [[ "${l}" = ^* ]] || use l10n_${l//_/-}; then
+			l="${l#^}"
+			dodoc ${l}/${PN#asterisk-}-${l}.txt
+			rm ${l}/${PN#asterisk-}-${l}.txt
+			for pf in CHANGES CREDITS LICENSE; do
+				dodoc ${l}/${pf}-${PN%-sounds}-${l}-${PV}
+				rm ${l}/${pf}-${PN%-sounds}-${l}-${PV}
+			done
+		fi
+	done
+
+	diropts -m 0755 -o root -g root
+	insopts -m 0644 -o root -g root
+
+	ebegin "Installing audio files"
+		dodir /var/lib/asterisk/sounds
+		insinto /var/lib/asterisk/sounds
+		doins -r .
+	eend $?
+}
diff --git a/net-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
index bfadac6d6ff8..adf38368d01c 100644
--- a/net-misc/asterisk-core-sounds/metadata.xml
+++ b/net-misc/asterisk-core-sounds/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="alaw">Install the sounds files for the alaw codec.</flag>
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index f131d5c24a12..7456abd73efe 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -1,20 +1,48 @@
 DIST asterisk-extra-sounds-en-alaw-1.4.11.tar.gz 13870284 BLAKE2B e2d2fd645a3030389cefd86223345d2124e74c182daa7f938b83fde4266f6563f6652a56067b794086688635c765549490978811671de7f1947d4e401766c4af SHA512 485a265d1e28cbf03e57fb02dc517b1004806c8ff9f13aa24ca6f6e17a8101871e4b81a52c1691ac16af7e8b33d58795bf12a9516177ae67dad9f14cf73615ee
+DIST asterisk-extra-sounds-en-alaw-1.5.2.tar.gz 17464549 BLAKE2B d13489f43b8654f021d1aa3d9e156b487acf7cfa3082f7aff4c1dabf3e931a3ae1a9a8eb10f0f9386649d4240a424c9e8082ffb1838025664ca0e1af60b8cf2d SHA512 4750b631a012ff5c36d38579e8251bfe92b11e9f141f02d488fa263bd573e9b720932a516fef362d7b646379013a3173f9ec3b65bf9915a11f831e10faeea00d
 DIST asterisk-extra-sounds-en-g722-1.4.11.tar.gz 14184931 BLAKE2B 16ad2eda0fdfa514b378c34974a634c30adf56cc9d4c519553252309b2bcb2787fe587f9ef2bf406f58ff25b8acab0f74fa520df8b7c6a956ad8e0c0ae562e12 SHA512 0306f024142712d56aada332d10a45222e49feed0701d65b3a214681b10074ae7dd9d68f952fa826f9e80f35a6bf67b5f1206c49394c9c530588eefe28e590cb
+DIST asterisk-extra-sounds-en-g722-1.5.2.tar.gz 17815160 BLAKE2B 032c5e6f3f8b26408e4b2e45cb18bd7cec0e88ac56528fe8dc39fcd79941058eb563dd79cacd7626f88528b68e07cc539f6b3dbe3cb04146bb724684d75359ec SHA512 9475561b0e5c2e5715734e9a3475d6a2def86c809c4a96eb6569acaa13f6ecc1fb23a3550e18afdcf706bfa87ec7533bdcb5b60563485c9b070521dd535ae485
 DIST asterisk-extra-sounds-en-g729-1.4.11.tar.gz 2102012 BLAKE2B 5780127390437f155cc64a22a7fdf023e3db9649050765d415b7b798969c20135a6af60b39a5c3ed8a08c2331bb56b418d4c5b8c0dd488e9f0e3c483b2c9a26c SHA512 32de0ddc94db5a25000038b44b4f475e69350934319ddf3762f26f096a700a8369ee3a5fd888645af3ab3b5198850aa9776e0378daae6a91a1850f33a7a4d8f0
+DIST asterisk-extra-sounds-en-g729-1.5.2.tar.gz 2663681 BLAKE2B f397c624ffd7ac74e340a65c9a854991f6138e0eac5b7cbcf48f159ba04ad06ef6e9190c4a15aba9af972b0e4bbc0b023500f7b826c48273336219a820f0b113 SHA512 b39abdbdf16414cb8b76438c85dc4f96a2dd07c82384850de25cb42a9fe05a04dc93fbe82306501530062e5ee02974f39ad0b822683394b8eb002bcf37ab6f54
 DIST asterisk-extra-sounds-en-gsm-1.4.11.tar.gz 3349898 BLAKE2B d01099ead6a6c4183de53e1e2d23dec4ace065bd37ea2ab913b70694325cbd8667f48b78f6ee7ec28341964c4183167b4eba96cac997f97846fed61208712111 SHA512 fa65d47f2946194791671cb35aa604e2d17da9f24b04e99e0385bf076131c59d76f44fe42e54febdb14bb430e961a734a56146d1b54cc89747ab68f290d3d633
+DIST asterisk-extra-sounds-en-gsm-1.5.2.tar.gz 4253587 BLAKE2B ad6b3c0edda921f3dfc25ec16fec0087949c10521a72cc3b012de9760f2631363fbf7b35d96cc483537192c71cdfd0a5c2dbe365727ddd8c81f87aed3fae3b25 SHA512 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
 DIST asterisk-extra-sounds-en-siren14-1.4.11.tar.gz 11770392 BLAKE2B e431f837e0cb7f561da3359271d10da407b674928d2c2a20c7ff51d12fe0959c3918539ea606ceab1f89c451cfcb79a7aafec74e8cae22424bae2cfb064af437 SHA512 dbff3cc3ad8d8ba5c1db7b19fe843198ff398f049fadf4d5ae93d79ef3cf5a24c3b3f68117197800e23f8d80fe85fc300d5cc5d6d33ab9d78b533c623ccfa88a
+DIST asterisk-extra-sounds-en-siren14-1.5.2.tar.gz 15150767 BLAKE2B 67c4f6629e1f1fe41456a7a83436a92b45b6bfe73ba1838269e7860ca3c0dafc99519e50f071ef96045774e8d083ec3c63bb7bb25d9a06e21e7bf9232a631ede SHA512 34ed3d3d0c3109a13dfd65d91862f1199b72e599d18e0590f5a8d1fc82ba846d5f8f34bbef1c245964a58186c36d45d7da979ef746c62df160a46e850e4aa530
 DIST asterisk-extra-sounds-en-siren7-1.4.11.tar.gz 8001319 BLAKE2B 907ae54ef3d6188074545f66da1eb9561972ae73319c8ad5205d2ba55f8ebab2537789b8d9ed68b05c36fb7868836eadab78eef94f52d44eecd02622dddf592c SHA512 430c8c4db2409cf173ab2677446f2603d92beb0b480aa41adedfcf0cbdffc96654b82026c0ed50787b71b8e9736440539d476b7c62bea81cfd11cb94e5af1e7e
+DIST asterisk-extra-sounds-en-siren7-1.5.2.tar.gz 10220208 BLAKE2B d4abcf8011b15e00629936a6dd607b2fae5bd42723777feb333ae0a543eeef7e292fbdfbc24a5d75797ee9212a6f1c871095aae94233dc5b98c22be149f814b9 SHA512 29139b5f18dcfa38a201132b17e29ec2bfb1a365d6f2af75adf817b7f7a82c6e9407f3fcbfdecbe7e3bbc382cf0547223a39f101f72cab2c9205cce2b869f061
 DIST asterisk-extra-sounds-en-sln16-1.4.11.tar.gz 56596426 BLAKE2B 702557b17ade527cba92131307c5963d58afb5dc6583280eac443be648f8d5207ddeb991da8134c37df8c9bc7a98b03a0fd0ca27f1ecf685dd82c15f658166ad SHA512 29bd4d2761fca204e645db2bf103a9839a4e7ab610d77eb19f437a3ee31111de80d6d99ccc46232977f230271da78b4aa9d635aeb11a6770b9cdd6a7cd6da056
+DIST asterisk-extra-sounds-en-sln16-1.5.2.tar.gz 71751247 BLAKE2B 352447f6b523828e7700b86ada364faa9476b9d75f944d0bb3c86576accc52f59f47bcc0642d919bbb670dfad023e3925391372bee9da5e52a4e7d8434ba56db SHA512 2116ea9e9e89f6b45e93e27d534c279968ac028552862ecfa45a4fa5dc399c01f9d7f53cfa0e8c965fea585448aa6f2bbe98784c67adb15898cafdf085549537
 DIST asterisk-extra-sounds-en-ulaw-1.4.11.tar.gz 14277966 BLAKE2B 32a38bd23877a22de2e729639826611af007e948026fb371b6fe50bc2840ca27350f012e53bcc2e3b26ef1a901f3a14ba247af64aa71ffe8e4718d6404917489 SHA512 bf64aaa2e59aac112a30b5797cf9feda09ad81aa95b8f800381c4276b9138fe826cec0aa562ad458bea6876801d0163e680035c935e756bf951d6d5edf4f87d1
+DIST asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz 18007258 BLAKE2B f93f42dac0c86cddc400eae04a61287b4624f80af14a48fc3b3dbc77d9665277bc0d1ed20a2d296d47470f9d76a509120387c0b2e4097f95143ca53b2cd9fc00 SHA512 0faec35716596e549cc24acfcbac177d2a3e628e5c9e2bc9e038e76de1f35f1cfac28e1d9e7ab4c2642aaba42f5fbc2ee1d4d7e73af16efac4f63ca889e0fab6
 DIST asterisk-extra-sounds-en-wav-1.4.11.tar.gz 27948533 BLAKE2B b082a95d00b831c3f2ec1800c6a8cdbd85c58b569ac0e56f9b339bd2539365e7780955c1e446a840343e0c0be9188a407f6a3c11b4956107b3100fce17821dcc SHA512 163d7acb06ae8216c27293351768b658e61ecf928c5e13edcbf25014107b763d92e3e31424ba36703a7d92b617a78d9491bff86fce5046fb8ecabc3327f364b3
+DIST asterisk-extra-sounds-en-wav-1.5.2.tar.gz 35362826 BLAKE2B 725539564430e4e2463c7267189c4b486762b855b8c4c3108fdd09cb11d03367f6de182f64c91f4563357f4dce120807da1cb15c064f2dfa8626834401a1b28a SHA512 778972f5674d8d6c442f397375a2e659037293cf480870957471a6e06efb1c6f48b41acd4fdc6377e2d47ffa828d5795b5cfc1d16ab99ae26683a7096aa71ea1
+DIST asterisk-extra-sounds-en_GB-alaw-1.5.2.tar.gz 12731197 BLAKE2B ae0ef60953bb50ce610befc500996734ad6a3cccc0eaf537a0dab1e7dba53800da954a31a39c76da01c10ca979f6e6ae4a7ca2f607d585a297f78be8ee5e4ec0 SHA512 bb739ea26291372ca7f804eb3b4c6dfe2538c92c371ded13349fc3e3b93dea068803068baa5ce35a3309c935bd59904d3dde819e8dc0252841830ea5d49ddd12
+DIST asterisk-extra-sounds-en_GB-g722-1.5.2.tar.gz 13561072 BLAKE2B 3580ad467129371c93e441f9939c0b53b3cffc16aef71bb126f7b53784cd4745684a13706bb212868f484110cb42fe5ca50a11ff7dae5f5821014d186e2cc795 SHA512 8f37d73ca67ceb614e00d8b06f625068bcad3270b7266f81d1b41a1ce5b6f6ca9ef4c96b170ec924176502f352608b8eb33848a3bfbc0fe2b2b4ed54e806ddc9
+DIST asterisk-extra-sounds-en_GB-g729-1.5.2.tar.gz 1990546 BLAKE2B 5e2e7f431fe2f060d8b47063ee8b63fbebc3347f18178ecdcfbbc72f29e03e9ded066b3d457f5f0fe0f1755feac845b79795371eb5ae53bf45b8656bbb5253c1 SHA512 4e1298d55e15dd148367bba67c4059cdc26f923afaa0d71649a257de87eb9797902dbf52bd57054e6b539eaf8f5d1ec173bca7e0268b05a184a9fc443a955340
+DIST asterisk-extra-sounds-en_GB-gsm-1.5.2.tar.gz 3156673 BLAKE2B 4c4c12f792a4536812f9ca09d51722b10c7d19fa0279ad5f02f7e049c5a2b42aad686dbf37584266e0b61e1a9bd641f533555efbd3fa3c43f9dec783784cd6aa SHA512 c6cbc923172da76381524bdcf6cce9efc587ad26295d963499ecab18bf5433db78f72c2ca15cc1c3556e4611c7987a5f61872afc454f05a38b2520df98d3d99d
+DIST asterisk-extra-sounds-en_GB-siren14-1.5.2.tar.gz 11544582 BLAKE2B 57c5a71bef59eaa9041c39cd76435289d6c4ea77a37d0f17874f8671da8d321fbccf98df18b14572ed6d5423482eae6ce3c95e2f62c87bcbd58c4ce44f074973 SHA512 1f4350b9fdad08860bc866c87c5b433ad5f2db53a649e22718e18ac1b410480562c3a9d2a5874c7f33d0cf5693aca3f11b733fe0396d92736118e6745d06c9e0
+DIST asterisk-extra-sounds-en_GB-siren7-1.5.2.tar.gz 7685115 BLAKE2B 4495210d56526845a97f55c9bff72730a10b9bbff1cb3b569cb65e657ccc9fac549bad6cb5b0a2853f8a0f9e0ed5268bf41538533a08eff9114a6eb29338db7c SHA512 6cd43e8e2f7cc273c8bba87648a2e999d3f0597de342bc129c0e5cb48323b9b39a3a7ec4b29c899cbe17077b7ea79497d6639b14f2179a8b4ca39e6ac5c87cb5
+DIST asterisk-extra-sounds-en_GB-sln16-1.5.2.tar.gz 51293019 BLAKE2B 17dcdb87b0f8b95e2fd7c2616977710aaef70f38e17b89b654fbcb5e7b5f11b1d06ae0997265958e4c25ea4f7669fc651a2f1f2c4ea0cd3dfcc0f64228ecfd34 SHA512 d55aad7e7df1b5bb6e267052149d719e00b46e8e355a6fa9ce3d77324464dbd7321b4a47d505455eb4a94e705e8f8e3f56cdd58e118ed561e97c5768418c1d56
+DIST asterisk-extra-sounds-en_GB-ulaw-1.5.2.tar.gz 13232169 BLAKE2B c436442adbb0d09b9b1e4090f207efa30ad67ec9c587b843e73b7c7a48718c4f10b23abbdb84137cfa06dcd4d165d2c7e7d085f92a2e8262f0521f40de8148f2 SHA512 159674ce0ebe884415dcf07f4251e8cacf0068b7de596c77e5589bf2f5cf6b169121a06e68a8a8e3bb9fb2f858894bfaa2997c5a5df2c4fbaa6d35c01b5cdbaa
+DIST asterisk-extra-sounds-en_GB-wav-1.5.2.tar.gz 25252034 BLAKE2B 432c48d739b3a91143b8c504604711b9584a9a52c7c1437b02214792898127d24180511891b74b3dba9ef2a7532b2c0c8a13d7742ffc44db4ac25d4e1a318846 SHA512 ddb6dd210b0340cc5ce0bcc933d0696ca0bc9fc6cc2e44d8588b60885cf5a8a6c41cdf32944e1ba10de6a3d345d9f8c9b8989c75d6ad4c1b5e024a0a93b90773
 DIST asterisk-extra-sounds-fr-alaw-1.4.11.tar.gz 11474936 BLAKE2B acebd2736b5610a5fdf4faa9e2768fcdbeee50bdcbd96dd947fd5d41028c92e142c2712e1f66058db908225242d8834482f69ce9bca0feb9f2acdfa80f683609 SHA512 c5922db421e168e350785f837b8007540438cdd9e5a8fef0260120c23f0d6df5ad83d18f11545e23cb24b68fd35b0454594091fc8a75176d1604bdd5b08290da
+DIST asterisk-extra-sounds-fr-alaw-1.5.2.tar.gz 11080544 BLAKE2B 47a321c6ad544f09031fe4ae944361627c4d0f6bad5c058fa62f620c3b943b1b020bf1652e67dcfc021c332ae828345aa1be2994adbcda33d8da8bf703770223 SHA512 ec2da3fc3f8ace0727a3e7d99e32336f4b0e5e24e7fdf87f24a2d747264dcc22b61dc559126c160630da9462dc3651ef684f175e25a454dcf308068cc2febbcc
 DIST asterisk-extra-sounds-fr-g722-1.4.11.tar.gz 12976829 BLAKE2B ab46dc935b4f29b7412bc6a7a913d289fd5320d03ba55a0a43b33f6d8af25b49a65577236706ba26b4ef69e60fbf26fa6a9fba641c3dee7e4e70ed8d1c34a904 SHA512 834a4baf05512e299be5cf5eaf7b100dfc8c77175515fb53885b9393cc7edba5e582780a8e3b689eed9c6b0828d3a989c39e96c601b49a2353bbf8487a7fa52a
+DIST asterisk-extra-sounds-fr-g722-1.5.2.tar.gz 12344234 BLAKE2B 7c8c959f360070224eab9b5a282c01688d096a03378ea6dfd1579154363e33db796cb4ac160e7c45d1a8ecf50bd5287a8a93e978c1087c3c2e7c1368603484ae SHA512 6a454011019151ab6cb694037dbcb57d179fb5d61ddb982d8edd39762ae7d6bf265537f3a029de3b7d9ce968d1314fce82b3b8aab7d4c03562e06e645d2874c7
 DIST asterisk-extra-sounds-fr-g729-1.4.11.tar.gz 1868622 BLAKE2B 34d14bf1dc64fe5f69e5ca00c9fb9b10a8a51872cfe05ffb682b9aef63f783e564b3f35cf1cb97da32f7de21072f4c2c83153819e889dd9066b9a2bb68ff03ae SHA512 2cc5fe3cb600b4f08cda0b67f63f92a0675b7d88bef193eef02b2d76c1a1357221ddf21a7ae3e64bf9741528241969083c7374a9dd9bc8fa94213912362ba009
+DIST asterisk-extra-sounds-fr-g729-1.5.2.tar.gz 1817900 BLAKE2B 5e49d512d33dc3dd63aab08840d62d6e8ab294bd7cee09ededa0de45f613e00904885ed3602fe2f30f5e7fe81e2ab898aa6b1bc4fcae183841dcf234fc995b5d SHA512 64e8b4538b0ac6b12f30374cbd23902569b762fcfe29712ff662a191f35d8577dad7ca9434db6646b892521420bcd805235374d588b77bbd7827db9554a4caf3
 DIST asterisk-extra-sounds-fr-gsm-1.4.11.tar.gz 2930043 BLAKE2B ef75cfad615df0b8b6060fcc3ffeb14128ab9ee01c043f078a7f6faef2d2990aee301ee20ba20cd59e45f812d15969c38a48ca85447b08cd4cfb8da096ca85a0 SHA512 f9df81f89c679f1f28da7932c544e5d8da7c60fe06dbb1b11978b02e881eeae134dc298a4a971812f836c49e3c0491e983286ac45e5640c23e62fb069315aae6
+DIST asterisk-extra-sounds-fr-gsm-1.5.2.tar.gz 2860633 BLAKE2B f14ce09801f37bc48929b53510cc1ced5f7025168cb4a0b8a3339b705799c23dc12b8c8e384113dce3dea20889896f7f7e7df093b656c6db8040133171debe0d SHA512 edac504b82b577067ba99c4b7317fbc8dd943c28273486dd8c2b131719b4d0f0275f8a24a28db0fe068e24fb510753742fe819420fe43da9bd69e19bdacaaa7a
 DIST asterisk-extra-sounds-fr-siren14-1.4.11.tar.gz 10811820 BLAKE2B f7ddd64cd6423ad69c4a77fcb297d221c25139a0e26aa96b7777749860670ebe912ae0aa579fc8c65eb0b58367c52d676af06227fea88e3744551897509be14d SHA512 5af35a5d5c5e800c372a00eeb30b0f942d9b6b3876f3290c92f2c24607527901edbcab29a72d1464ad5e9a5e3a65694a3e09362162bbb19e977fead694b08ce6
+DIST asterisk-extra-sounds-fr-siren14-1.5.2.tar.gz 10481233 BLAKE2B b6d479310bb1e92705ef4078d483d0c457131e1c5cd68af5fd1f40b6497168f3fb47dc3fc48ddea37dcbb4c9e644b0fc73d9e523ee237f8fecdbfcf607b7278c SHA512 25d508bf2928359e884204e41fff2ff557bc5dee02457d58e91e9f6867f3287dae5ddacd0f074e5091d74bc186ce5a42d6c94cde34b21e8c316dd3597a3d3a24
 DIST asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz 7128320 BLAKE2B cfc9b2fb2734d9363bf16d7dbbdcb8e7741fc998a78b767777dca041c57e70b0aace843393c183f889f2915b786233d2799b03761dae9340221861bce1499cd2 SHA512 e583beae9a7878e9b5975ad4556ea9469f327f145e6ba6c4775c4023b6b8536931ae884aab0c2af1d3e1bb2d4b92600082337f6e6520e8982b1da7a6b5646962
+DIST asterisk-extra-sounds-fr-siren7-1.5.2.tar.gz 6879351 BLAKE2B 78d16b2e89e46d1609cab428e97b6f579beb8f506ef3fce6dc133d14c2e2dcb248c373faf031520b565ce0767d0a32c132b060186cee884a0b804b8ceac25240 SHA512 2f56237c2f284d1349c05a908e1acbccf752c312fb46a0786a057c9aad48ed0d0d625ea9f6fe9195b633c9ac47752dfb5787a120f0f3d0f80873c15f22343206
 DIST asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz 48517491 BLAKE2B 80b6e4da30b5e2c65c48c81bfa44cd14bff3eb19fbb3d6385dbe7fbca7e39a881154f6c1fa839360874c65f6e4916ef9574006041ef0f68ee9245c7340d1e46e SHA512 f8b0a1eebd93fdda707846dc73d30418462a07572962cbe822eb11ed5c2ce7741b185b0e4abd05c47d0c2c53e817c47b3c493d94e92e50848c7a270e87e9a586
+DIST asterisk-extra-sounds-fr-sln16-1.5.2.tar.gz 46455599 BLAKE2B 9393a1cf69796e2316e9e8c9d876fbaee9e5b9c82cf3fadbf0839589c2bbad01dd41c8d6de7092ea86b1bf5e4b78f67657e3f5a9a28bb0a809e2a99b46f05161 SHA512 350ebef201ab3d8c3f691ef24787a219807b6fb32204a0f5a9928588376e661fa38bb938e3d75e6ce04e8a617a938e59e236113cc7bb4033b033641c37c0f2f3
 DIST asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz 11818928 BLAKE2B e6669c4b041e96fda7beed7de4af3ad876c28419e639b4d45797c00272ac03fb71ce23cd584aca480e203e37585a1e793e42514f83341a745e4111ed49bdba54 SHA512 34ba851729186250a3fc459b685c0a4d475e32820e4a49b3a1b2c038e0252a71a0637e1bfd67e0bd4960cb90ec24f8cb28435a049fcc91f7b3ed4f0f1009b0ab
+DIST asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz 11539559 BLAKE2B 919cacb90afe5a0b31c886184a666cc7e9d6af82cfb319937c597f5a54beead748ed64a774d0e291c680ebf998d773b9b23a4edbcf534fb74daee58a67190833 SHA512 ae3f2084be7ca5be9106afdff9c6c5f059ac4628e7a866e166a6ce70a74fbc388ddb27daa03394fb9c7009236d615d7e8c7c00fce45b64995e0901a05aed15ec
 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
+DIST asterisk-extra-sounds-fr-wav-1.5.2.tar.gz 22856532 BLAKE2B 921135610f7329893f0a90e88845507a26240948dde9fb4b83db4e9133d79fbd395336ceee2504e2438f868216901eb7bae79e2c63168255bc538e2892469102 SHA512 edbf1b36b2c2083f696f52021e7719d4ac6ced29c312de77465fb3ca7d9444e09cc91fe3c6fdb45140124c44418c571f2ce1145fcff5cf88765bd0d62770e3b8
 EBUILD asterisk-extra-sounds-1.4.11-r1.ebuild 1420 BLAKE2B a0c707d7bde726eebb1adaeef4130d5d20dd439675aa6ca95a96eeaf4315dae6c2ce25d88d0e9cab76fdceacc076ef3a39a62f22cf7bdb2149a09e1f387ed268 SHA512 ec0db8212930f95416ec8b9997bc7651a67fe10bc7ce4a47681b89a4f06dc900c8c857351e1724b1ac7d3a578132786f1c5e518f6d80bc94f95625ae430014b3
-MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
+EBUILD asterisk-extra-sounds-1.5.2.ebuild 1811 BLAKE2B 25fc237df6781271c29b67221bbf958a090b4ddbead3e2126dc8bfcabd86f5688c3a4280c934c3d5d5c4801dbd97711333f0d1b47926d56e23747bc1ea268783 SHA512 39dc64c390273f30817e8a0bdb117c5bc6751046787bb8ec7352e40fcf1c52df91096ca9a5aa72f7bc2ed136ce807310e9969de40baf943cae3c90782f68c747
+MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
new file mode 100644
index 000000000000..6f762733bdc8
--- /dev/null
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Extra sounds for asterisk"
+HOMEPAGE="http://www.asterisk.org/"
+MY_L10N="^en en_GB fr" # ^ is used to indicate to the loops below to NOT set this as an optional
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+IUSE="${CODECS}"
+for l in ${MY_L10N}; do
+	[[ "${l}" != ^* ]] && IUSE+=" l10n_${l//_/-}" && SRC_URI+=" l10n_${l//_/-}? ("
+	for c in ${CODECS}; do
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )"
+	done
+	[[ "${l}" = ^* ]] || SRC_URI+=" )"
+done
+
+REQUIRE_USE="|| ( ${CODECS//+/} )"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BLACKLIST=("astcc-followed-by-the-pound-key")
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local ar
+	local l c b
+
+	for ar in ${A}; do
+		l="${ar#${PN}-}"
+		l=${l%%-*}
+		c="${ar#${PN}-*-}"
+		c=${c%%-*}
+		ebegin "Unpacking ${c} audio files for \"${l}\""
+		[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
+		tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
+		eend $?
+
+		for b in "${BLACKLIST[@]}"; do
+			[ -r "${WORKDIR}/${l}/${b}.${c}" ] && rm "${WORKDIR}/${l}/${b}.${c}"
+		done
+	done
+}
+
+src_install() {
+	local l
+	local pf
+	for l in ${MY_L10N}; do
+		if [[ "${l}" = ^* ]] || use l10n_${l//_/-}; then
+			l="${l#^}"
+			dodoc ${l}/${PN#asterisk-}-${l}.txt
+			rm ${l}/${PN#asterisk-}-${l}.txt
+			for pf in CHANGES CREDITS LICENSE; do
+				dodoc ${l}/${pf}-${PN%-sounds}-${l}-${PV}
+				rm ${l}/${pf}-${PN%-sounds}-${l}-${PV}
+			done
+		fi
+	done
+
+	diropts -m 0755 -o root -g root
+	insopts -m 0644 -o root -g root
+
+	dodir /var/lib/asterisk/sounds
+	insinto /var/lib/asterisk/sounds
+	doins -r .
+}
diff --git a/net-misc/asterisk-extra-sounds/metadata.xml b/net-misc/asterisk-extra-sounds/metadata.xml
index 7413756723d5..71b32add35e7 100644
--- a/net-misc/asterisk-extra-sounds/metadata.xml
+++ b/net-misc/asterisk-extra-sounds/metadata.xml
@@ -2,14 +2,18 @@
 <!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="alaw">Install the sounds files for the alaw codec.</flag>
 		<flag name="g722">Install the sounds files for the g722 codec.</flag>
 		<flag name="g729">Install the sounds files for the g729 codec.</flag>
-		<flag name="gsm">Install the sounds files for the +gsm codec.</flag>
+		<flag name="gsm">Install the sounds files for the gsm codec.</flag>
 		<flag name="siren7">Install the sounds files for the siren7 codec.</flag>
 		<flag name="siren14">Install the sounds files for the siren14 codec.</flag>
 		<flag name="sln16">Install the sounds files for the sln16 codec.</flag>
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index 73478059d000..a7e79ab1932a 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,5 +7,6 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
+EBUILD asterisk-moh-opsound-2.03-r1.ebuild 851 BLAKE2B 18b1dabecbc0ec28bc9344f2512d8aeb897934844aea8fb2e095471dd78a173fd5b5cb16e7699ea4ceb7f08f52d1b2c91b8b3c2799d0a0231331dfab15351516 SHA512 975943436f79e1b93214e3d4117cfab7d9d43227b75a248a0f4a478369bf4bca3fa6f3d2b851ce800812ec52d123b48a712ab53fc37cef4051af875532f534cf
 EBUILD asterisk-moh-opsound-2.03.ebuild 1140 BLAKE2B 7bdcca804e6f84086415dc3bbe06025b2225267bd261aefea6590fdbc048879db6f2d887862eb4f0d1fe41c573a2389fe932113dd2ba5a8c9e278e66281ca846 SHA512 feff1f6cbdb0786c81e8917a3a5a958d0ebc3d518cc98f93f8d2a2142cf745ab3b05616a15269e92fea082743e4d5f0ddd1f7b18daeb4484f1aa5c242087a7e7
-MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
+MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
new file mode 100644
index 000000000000..010127bad37c
--- /dev/null
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="asterisk moh music"
+HOMEPAGE="http://www.asterisk.org/"
+CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
+
+SRC_URI=""
+for c in ${CODECS}; do
+	SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${c#+}-${PV}.tar.gz )"
+done
+
+IUSE="${CODECS}"
+REQUIRED_USE="|| ( ${CODECS//+/} )"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local c
+
+	for c in ${CODECS}; do
+		if use ${c#+}; then
+			for pf in CREDITS LICENSE CHANGES; do
+				dodoc "$pf-$PN-${c#+}"
+				rm "$pf-$PN-${c#+}"
+			done
+		fi
+	done
+
+	diropts -m 0755 -o root -g root
+	insopts -m 0644 -o root -g root
+
+	dodir /var/lib/asterisk/moh
+	insinto /var/lib/asterisk/moh
+	doins -r .
+}
diff --git a/net-misc/asterisk-moh-opsound/metadata.xml b/net-misc/asterisk-moh-opsound/metadata.xml
index 7413756723d5..71b32add35e7 100644
--- a/net-misc/asterisk-moh-opsound/metadata.xml
+++ b/net-misc/asterisk-moh-opsound/metadata.xml
@@ -2,14 +2,18 @@
 <!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="alaw">Install the sounds files for the alaw codec.</flag>
 		<flag name="g722">Install the sounds files for the g722 codec.</flag>
 		<flag name="g729">Install the sounds files for the g729 codec.</flag>
-		<flag name="gsm">Install the sounds files for the +gsm codec.</flag>
+		<flag name="gsm">Install the sounds files for the gsm codec.</flag>
 		<flag name="siren7">Install the sounds files for the siren7 codec.</flag>
 		<flag name="siren14">Install the sounds files for the siren14 codec.</flag>
 		<flag name="sln16">Install the sounds files for the sln16 codec.</flag>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 2c6245b8ba5a..1c5cc6099665 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -14,8 +14,11 @@ AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d77
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
 DIST asterisk-13.23.1.tar.gz 33064056 BLAKE2B 7f531766df5f2db29b562e7c7d4e265d5cf610f192188691279c0294195b835bb62beef19d7e9554862e6b44764064b21d50a3e307bbf85dd12b67a2df8be459 SHA512 227bfc80b2e6382019d608296c4e1c8e992ba867636fa2c8ee578d0aa406b8828bf7962b24035d9b581c433afd18be7cbe98eb954112661b9759b6296ee686dd
+DIST asterisk-13.29.1.tar.gz 33061969 BLAKE2B b581a3b706438fd0f685cab9c6148f9803d09f878d2ec824cd7b3edb299d5514e7c473622f135caa8a7905ab70dff915b83ff9dcbcf80cb04955ba8dea03c968 SHA512 3c32324f67413abdf73a3146b8e280fd23d65854df23b87b01e7f20c635c304606f6216c49c6dcd44c3a09b945d15124a5d70182c4b69e5ed8e542a13589d2df
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
+DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
 EBUILD asterisk-13.23.1.ebuild 9721 BLAKE2B bb24fad06bea49534ead1bb19917842eed3e04c24b0a2f60ae2035544ba250d420c995134cbe221a51aa05327c45cfe5e44710539891966fb0af7d6e379876c6 SHA512 42df62f3e23ceef24fe934b2565bcb44fadbce1c69d9c6c17c14afea457418f250ad99e9969a4197ab28b208a48d7fb86ab4a2872d27a1fa1f00c01dcd86f41e
-MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
+EBUILD asterisk-13.29.1.ebuild 9818 BLAKE2B 365c779b4cb8efc96eba5c03447b6e706bba2bcc7ba942bedb190fdcac646463fb7ddfbaa4924048729d30bd4daf858cee7f4400092ab2c41ec63c1d604714a8 SHA512 99c700cec1b101c3d85c452be848fd7e616906fe541f20c53fe2d8e342bdf6aa3377671340fe71ed5aa4720d10f629207718a1fbefca771a1e85eb5cac726121
+MISC metadata.xml 1302 BLAKE2B 813ef13f37f239e03c203a77d1b035d7177c24fc96c4da6cf333b1779ea7fc4be1bf44a288ea5f0f21cc284136ee67ef7a68178a048cb4890ac75001e4d4fbe8 SHA512 73dbe17abd814e6f1babbfb860badb42b64bec299cb1cd75db57fc05e9ea775a14b0f2c5c9ec9f4422a64036d90c2797057ec273150da17c91d6b957a71d6f73
diff --git a/net-misc/asterisk/asterisk-13.29.1.ebuild b/net-misc/asterisk/asterisk-13.29.1.ebuild
new file mode 100644
index 000000000000..e056b36c4193
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.29.1.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools linux-info systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	pjproject? ( net-libs/pjproject )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? ( media-libs/libvorbis )
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+function menuselect()
+{
+	menuselect/menuselect "$@" || die "menuselect $* failed."
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--without-libedit \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISE_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect --disable chan_misdn menuselect.makeopts
+	menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect --enable smsq menuselect.makeopts
+	menuselect --enable streamplayer menuselect.makeopts
+	menuselect --enable aelparse menuselect.makeopts
+	menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect --enable func_aes menuselect.makeopts
+	menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa         chan_alsa
+	use_select bluetooth    chan_mobile
+	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster      res_corosync
+	use_select curl         func_curl res_config_curl res_curl
+	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds      {cdr,cel}_tds
+	use_select gtalk        chan_motif
+	use_select http         res_http_post
+	use_select iconv        func_iconv
+	use_select ilbc         codec_ilbc format_ilbc
+	use_select ldap         res_config_ldap
+	use_select lua          pbx_lua
+	use_select mysql        app_mysql cdr_mysql res_config_mysql
+	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup    app_osplookup
+	use_select oss          chan_oss
+	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	use_select radius       {cdr,cel}_radius
+	use_select snmp         res_snmp
+	use_select span         res_fax_spandsp
+	use_select speex        {codec,func}_speex
+	use_select srtp         res_srtp
+	use_select statsd       res_statsd res_{endpoint,chan}_stats
+	use_select syslog       cdr_syslog
+	use_select vorbis       format_ogg_vorbis
+	use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${D}" NOISY_BUILD=yes installdirs
+	emake DESTDIR="${D}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake NOISY_BUILD=yes DESTDIR="${ED}" samples
+		for conffile in "${ED}/etc/asterisk/"*
+		do
+			fowners root:root "${conffile#${ED}}"
+			fperms 0644 "${conffile#${ED}}"
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm "${ED}"/var/lib/asterisk/mohmp3/* || die
+		rm "${ED}"/var/lib/asterisk/sounds/demo-* || die
+		rm "${ED}"/var/lib/asterisk/agi-bin/* || die
+		rm "${ED}"/etc/asterisk/* || die
+	fi
+	rm -r "${ED}"/var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	if use doc; then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 7790ac2d905f..c47b77295147 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -2,20 +2,25 @@
 <!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="newt">Include additional tools that require redhats windowing toolkit</flag>
+		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
 		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
-		<flag name="span">Enable support for the spandsp codec</flag>
-		<flag name="samples">Install sample sound and configuration files (default: on)</flag>
-		<flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
 		<flag name="gtalk">Enable support for Google Talk services</flag>
-		<flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
 		<flag name="http">Enable embedded web server</flag>
-		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
 		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
+		<flag name="newt">Include additional tools that require redhats windowing toolkit</flag>
+		<flag name="osplookup">Support secure peering using the Open Settlement Protocol</flag>
 		<flag name="pjproject">Enable support for pjproject (pjsip)</flag>
+		<flag name="samples">Install sample sound and configuration files (default: on)</flag>
+		<flag name="span">Enable support for the spandsp codec</flag>
+		<flag name="srtp">Enable support for encrypted voice transmission (secure RTP)</flag>
+		<flag name="statsd">Enable statsd integration</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index fa604fce8be8..9ad4ffc1c503 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,3 +1,3 @@
 DIST autossh-1.4g.tgz 67599 BLAKE2B 179af97ee6f3b9c1c4fcbad1593118aa5d69dbd2b6215efd4a16ab7641f6f0194faaca3c3101b3a918d652988a06b5fa8ce6e52f85f81edd95b3d71d49aad076 SHA512 499b560d978736f4e764d5d828282fdaba1cbf94811ae6be0be5434d9c1cdc6ca5513d728b6372aa243843cb1b91e61cfc5fdeb77ddb0b6a7ce027218ba67466
 EBUILD autossh-1.4g.ebuild 502 BLAKE2B a2d63bb81429bf158edc3c92ec6f5fc74705d3441f14b553cbe1562211a4f40c9e5399e156b3d006218dc31d73298ec5388e7653904e9f37a9164eb95dfe0d6b SHA512 c996e46e2dbb306103c3fb35650247ff8bc2fd2d0b6b6d6b3b15a82a67e20b4366b1b2921e092531639821ff33d57305f9e24a069b853ac69757c83301a9cabb
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/net-misc/autossh/metadata.xml b/net-misc/autossh/metadata.xml
index 6f49eba8f496..3398ef8b263c 100644
--- a/net-misc/autossh/metadata.xml
+++ b/net-misc/autossh/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 12bbd174e64c..bbb68f6ed4a4 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -19,8 +19,8 @@ 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-3.3.9.ebuild 3533 BLAKE2B ad0ad3ba282e9d595d6f5e6b049d8657171f0365125e0659c19ed0916671f84d6f2021a7f6480df675b152d4d5051a9746038392d1e0584e9efd3e8f1d732447 SHA512 a7b32de25e48d8ef00bda6d6dae9c5e734afd3511602d2c3f80a3a632d339eb811a0ebf39cc71a48b88492295f3210fa69f2fe16b9a0ebe929b0dbcca5e5a4a3
-EBUILD cfengine-3.4.5.ebuild 3759 BLAKE2B c661c7270bb701b4b5b6438bd6a1bbed609637aab9c9000e9b0daf3ba3a702d2d5953d51be8dc6e56a04bfe42583205ccdf8b26213de7be678d8ee254c75aed2 SHA512 c588abc9740b0ced92e16b2862cba76d6c12622d9d4965bca43ad5519e6e0d0e205ac1e3879af7f55fff6eea55feb07f6b17d9e69dc913e949490b85482e7de8
-EBUILD cfengine-3.5.3.ebuild 3826 BLAKE2B 9c78d56b8f52ccb0f28ebe9d432af2d486913b6f808c324ff99b2c2a0af6fb852dad3c3800b0a35bdadae2a97e8bb75ae516f64137062dc086dafdab91a4f0b0 SHA512 612841631d6587d12e0f3bb3867139bdb1719778d14c464b47226ea88c7063e9a4c1408c52068c9f43297a635addd20ee3f14ec1c9b49739bdd8939a5e6a7d08
-EBUILD cfengine-3.6.2.ebuild 4268 BLAKE2B a6b0f6b30ca2f8f9547af38256957f4334773a3fdccbd3c32d577064bd9e17ea84ebe8d13c091b40a17f4517dbaf1c332e30342dd0326464a9e7db446433803b SHA512 5d5d7caf6ed9e7556319800c363b8dc1ecaeac11de314d0872a0f0f320a83b5c73ae5f3f2fd6d32c47fe564a333fc41dfb8ed1a25bd7dadfc2d7f1603d4d9760
+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
+EBUILD cfengine-3.6.2.ebuild 4233 BLAKE2B 5122f44c2f29211090bdaacaf69ea5494ee5c17318dd3c3726a9291d5c7489f50b9d36f27a5cfbb197b890ee9a974f52ae74e012ce5263722e186cc191f30f04 SHA512 64cc74d3cb5ad93b5898d78928be0d81438bca150302ef236e71d6ee6acab3d370f3dfdcd2919685ebe6f98faec119dd3e8872d0f094bdd8d862740d9260e650
 MISC metadata.xml 2159 BLAKE2B fce780617a458d494a437239729a7841c860e797e66f1a8c783c4ffce62bef89b92ef644fa8258cf4209e44aa56b566e9df493a1ba34667611b47bf274cb7bd9 SHA512 c30ddd7fce32d4e7231b860d64940d9368085bc8f65851fefa886b312995512c48f7a1291afcfb80921fac64f2a676946c286723483294d13d4a9c89c01659e4
diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild
index 7588c8da106d..a671fd89e08f 100644
--- a/net-misc/cfengine/cfengine-3.3.9.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.9.ebuild
@@ -57,11 +57,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Evil workaround for now..
 	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
@@ -81,12 +81,12 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use html; then
 		docinto html
-		dohtml -r docs/ || die
+		dohtml -r docs/
 	fi
 }
 
diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild
index 074d4d8593a4..f3399734b57b 100644
--- a/net-misc/cfengine/cfengine-3.4.5.ebuild
+++ b/net-misc/cfengine/cfengine-3.4.5.ebuild
@@ -72,11 +72,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Evil workaround for now..
 	mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
@@ -96,12 +96,12 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use html; then
 		docinto html
-		dohtml -r docs/ || die
+		dohtml -r docs/
 	fi
 }
 
diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild
index 1afbf48c234c..911431636bda 100644
--- a/net-misc/cfengine/cfengine-3.5.3.ebuild
+++ b/net-misc/cfengine/cfengine-3.5.3.ebuild
@@ -71,11 +71,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# fix ifconfig path in provided promises
 	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
@@ -98,7 +98,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 }
 
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
index fd0b75a9d5c7..d0d55340c25f 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -77,11 +77,11 @@ src_configure() {
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
+	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd
+	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord
+	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd
 
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# fix ifconfig path in provided promises
 	find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g"
@@ -104,7 +104,7 @@ src_install() {
 	# binaries here. This is the default search location for the
 	# binaries.
 	for bin in promises agent monitord serverd execd runagent key; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
+		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin
 	done
 
 	if use masterfiles; then
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 5ca9424611fb..375decf72049 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 3036 BLAKE2B 430231032232c20309f05393c7155329579d4f4f8c1a2b861e6c7f00ea92d588398330f1b712ce3eb828fabb0e88c9d0ff71431ff39faebe5d8dfd20704febf8 SHA512 2fe71bee4b303f1f3cfa152aa2b0a9c44052c59196c35c8ada3f2249edaac3020bab26b1ec0bfbe5daf86ad958734dfe08e7511837bfbe9af07e2753636b12ef
+EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 6277b565b82f3d9290322065d025ce6c706aa3d5a626f841b6e4b807cc1e23bfacd38f6d1e2f07f0fc0aa3993eca7d67e44029e1ef2db6ee4eee25e538e39cb2 SHA512 484a709b47094650d8328f1347a8c687fcd990f5a35e6b5da3da65edc03b1b57b21c3820dfda090ca709d5606c0ee3051c557364355ee73454ec7d7f1991be82
 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 7c213a4f9e61..af17665ec607 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 22390b9edcd0..b24da7a146a5 100644
--- a/net-misc/clusterssh/Manifest
+++ b/net-misc/clusterssh/Manifest
@@ -1,6 +1,6 @@
 DIST App-ClusterSSH-4.01_05.tar.gz 71502 BLAKE2B f9e1f9de36173c766a382660e34adee3005a64550a90cafe59101fd3f4b66307990e254334fb270398c9e36a9d27657a27e7348b1223a7ccef04181f8c88809b SHA512 4b63b91684c981a28871e5264502c66435b531ae3c4bad2eab2571f8b237d43e5f45ed93d036e7497c713f2982a110d93a3055ae0004d4f33e7786df9aa56ff8
 DIST App-ClusterSSH-4.03_06.tar.gz 81476 BLAKE2B 6b513cb86fd4827eb510dd26ded9aa2d45ac1fe484dc10b8cb841c8b1fb50c7f279cbc6a63e817acbbf66e4aea5faa4f32cc612c387d018bf09abb18919fd7d6 SHA512 87dff4c0445436c10929bcf30a9295deb6ddacca16939091fdab0cf67765c77706745ce8e738145ea6c67ec06093567b7668e4387a72b48018f8e173da5709b4
-EBUILD clusterssh-4.03.03.ebuild 1065 BLAKE2B f23dd97279973da977a7b1708f845d67d27b9702cf431b6a6c91eec688486913558a9d68c0ddaae56abee527e2c910e8687724b99b6779ba1ef9c50a80f2bd6c SHA512 2f913d2a0dac204bc7a1623c5366d10f5446ac33e0fb22f68a90a4f3816a18068f3c1d619888d3aae0e75f9c1d0c0fb9cfd2a93d5a31345f6908e199fd719a47
-EBUILD clusterssh-4.30.600.ebuild 963 BLAKE2B e283618433cf1e67cd249d23986300b23d42b1696af991c77e1b1ae6b67fa43c0c2be0bdfbfb6d4d37fc0d0422c409d2efec996deb316c283bfe08a25faca81a SHA512 d206ca3467498443b3f1af7adbb194327203c967d81daaa2da9d55510a547bd9add8e1f81e27844450a46728c700ee60b181ad015e6ead9e4f0086b2889b631b
-EBUILD clusterssh-9999.ebuild 866 BLAKE2B 76da367ac5db0878a5058db827f281a143addc552e75a3c73fea8fe485af4247bd824c7f89b94b19575b60c6d99fc40960733bfd21cafab5e1566ef1d28b1e6e SHA512 2d3d680ff71842dd405c8b527e3e728faaffc0f45c8cc8addfff9ea3d142882658798d804e0fe3870eb82f9ba5a8590f26439dcdbd1f10225210446238efe3d5
+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
 MISC metadata.xml 708 BLAKE2B 7b8f81297e6627f6d072cb45a58319f12879277a5b2f414b6f3b7d0c0bdbb0358cd278b6d35e1bd4b01a4185a4f227706a43f21874c0bd36e6ba124eb9cb05b0 SHA512 f4033f8bfeb926bfb4a3ad935988068ed53eff91e35cb3683df27c8d56f095b7873a66fcd2e56c79df434a51fa1796c265d9d89334d3538b4f6a9f42755089f2
diff --git a/net-misc/clusterssh/clusterssh-4.03.03.ebuild b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
index 863fe1fd08fc..c121d86103db 100644
--- a/net-misc/clusterssh/clusterssh-4.03.03.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.03.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Exception-Class
diff --git a/net-misc/clusterssh/clusterssh-4.30.600.ebuild b/net-misc/clusterssh/clusterssh-4.30.600.ebuild
index 46eaa9f27080..bb6b7e86a265 100644
--- a/net-misc/clusterssh/clusterssh-4.30.600.ebuild
+++ b/net-misc/clusterssh/clusterssh-4.30.600.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Config-Simple
diff --git a/net-misc/clusterssh/clusterssh-9999.ebuild b/net-misc/clusterssh/clusterssh-9999.ebuild
index 28e0fdc6d1d7..666c202462f3 100644
--- a/net-misc/clusterssh/clusterssh-9999.ebuild
+++ b/net-misc/clusterssh/clusterssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Exception-Class
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 3f6d6ebdddce..d39c7f6c746f 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,9 +1,5 @@
-DIST cni-plugins-0.7.5.tar.gz 862670 BLAKE2B 17734beabde562cfd52efd479cb24805681a3d8a8abd4fd9fdcf9dbd891b2d5b3026b84a880355388c893db147fd0952786a86716438e140a46cc9a2dfffe0c2 SHA512 7ab43f88b4763907f56ff26d684385e5a3f6314ffb4bcbe356ec33a014fc15207392bd26e2d3041e117c604a386d21841a37d093b04e003303554b03721b32c6
-DIST cni-plugins-0.7.6.tar.gz 862694 BLAKE2B 4c66d80be260217f977f6f80ecd36ec8e3209b57ad34e1bfb03dc5df453ead6aeac24e2852a068430e94a83fc314f92bb9dac41432e16851508e170fa4e77c58 SHA512 28baaa9793dcec4d9417d6beaf4d85cb1eb433f401b3f7d905b2a60709825de0e9ac80a713d8944433e72c7381d502b14aff85c3dc5d665bfca3160f1bfcc13d
-DIST cni-plugins-0.8.1.tar.gz 3253670 BLAKE2B 7de5b53e310b496137c0ea0d6b4d22d5604e49fb4ada456eaad377a0b20d0b8883e7420a8d5f8cf92922e98b493608d495126772fd4205e4efb42b784fe3cea7 SHA512 ed57162fc3d014c897ee2f7f82b738624ca42ad7c238ac6ac5c1eb9ac865fe27f8ded1510cfb131f7b43e44f6cd0366ab83011386bcb6add36ea11235767760f
 DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952478190c78dc50bc7b65d6229ec33593fe77be4a8c5b593d9ea8bb806f9b8d04768bc52b689b006640cfa34c176a0a1 SHA512 383540232593c7ef8c28f83e660a58ae6dd2592c6d97a43c8fc1f046a3fa448911d4066ec0a6a7d7e770a1a2dceee7c31d742100b0871e07d691fe6bdffd42f9
-EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
-EBUILD cni-plugins-0.7.6.ebuild 1071 BLAKE2B c91d75b0731d98706fa8a739c245a807267e9f1523f6fcf0572d60126d53ca316a6229fc54890321e4e54953c55aa00398a74075b7a5c03ac357c01bce9f3a1f SHA512 e587dc1bef7bd8f476f31e99444636c38d175827cd75742f96dee2fc40e2a1a5c6a69519137ca42c9a0a1ae50c7efdb4813a89994552183160c4c0dc6bdc74fb
-EBUILD cni-plugins-0.8.1.ebuild 1130 BLAKE2B 1aa3cef41088f7be1bdbd050a547425ccd2ce2cefc0afcf8ac029980b043ff6f0cca65b576dda9315bdb5613a80abd3088e14a890759a2173009cdc0ce838dae SHA512 acb61386ae8a713f971138ca95e3394807ac238c906308695cac766bebdca5599607311e704fe77224401f42bd7e2c7d7b2db325b8f7278aa6fadb8411544725
+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
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.5.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.5.ebuild
deleted file mode 100644
index 9f9b42fe7ec0..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.6.ebuild
deleted file mode 100644
index 5351454f1564..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.3.ebuild
index 47b31cca168d..4fd45539a5a6 100644
--- a/net-misc/cni-plugins/cni-plugins-0.8.1.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.8.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-inherit golang-vcs-snapshot
+inherit linux-info golang-vcs-snapshot
 
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 DESCRIPTION="Standard networking plugins for container networking"
 EGO_PN="github.com/containernetworking/plugins"
 HOMEPAGE="https://github.com/containernetworking/plugins"
@@ -14,6 +14,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="hardened"
 
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+
 src_compile() {
 	pushd src || die
 	local i
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
index b9953a5a5cf0..ae63669f4bc9 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 6388 BLAKE2B 77a8608edce04cf5e19be47d91acda53faaa1741851974c04cad1c3cfead7623515512b95249e45795bfb321aec158f439ab6fb8e5785a37001f576da0ccb18d SHA512 837dec030c9ebf45d3a5f521f9a477fc24f1b91340ca052c938b7ba54a31d0529569d3c7026775a0018cfc6e0332585e62255f4b5074749b1b53ee8c46c18732
-EBUILD crossbar-17.6.1_p3-r1.ebuild 6033 BLAKE2B f4ac47903acc228320c224a18c832f9c15c42d5c721ff4da8f8e4c38a3174d6662996c51c4b423f64fd68961a4eda931058ca842982e34b6b4f2b3db73c566da SHA512 cbb1ad06f854d34194aee8f46f313a1d0f976fd6e2540c4749df26f4c81b9178357152c9ceeaf5317f31208e976b8b5e1b01edc7a5ca0af80c8054c85ca1faa6
-EBUILD crossbar-17.8.1.ebuild 6435 BLAKE2B d2e41ff6f90579d152334152cb42cf50e3e48dd9b198642aa0a36f738797edec812f4fe51b311871e207022e4b2897c48bb958483f2d4f17c895468a8e287eef SHA512 b440f74d45b22312f5a97304d40dc4c2d36a534202de19e15a20698f8be5faaea85c31b05309a45116820c9d26f25819135e5613483486ec73567f51e5772364
-EBUILD crossbar-17.9.1.ebuild 6385 BLAKE2B 5e6e26cc376fe091a5ad2fced8cb2ccdcc8ef30a2581816468744325e616ed7c6847bbb905457b9ee811689385a79e2313a68bd11db0a1071b107b318a616339 SHA512 0dcb2623777b352e0f168a0c59fef1b50d441c7fa486ba1bbe81a2152e39e68d5a633b3fdf6948985d95b4579068ef0e062ea99f269ca546312593f622d464ac
-EBUILD crossbar-18.3.1.ebuild 6337 BLAKE2B e1e3cfab199e176033b539881e977cc40c63431b1a83fbf5708876234e3c5b72335cc08231e990f0c1399c57f9ade92546326b1e87659eace7eba0f733682446 SHA512 896b8831d12986807f355e7172738fb0e69c0ddccabd29ebb1c65dc783ce1837006c521537b939500aa22e8ad2b17be32db81cc571bad2631daa8a647fb7d353
+EBUILD crossbar-17.12.1.ebuild 6415 BLAKE2B 3991f26ce55b0dd6fcae0a5c092da0a211f9f1c429036fe3d28b5e260d3337c12f346f2e14d65a5024434d80e5f1c4431ca0f167ee439f231ab7d0bedc85af6d SHA512 729c4d47afade22115aba8866f65fe71c305df77f05a524a0e5727e01dd57ab53ffa1a250b16802efd71868d238822eacb71ef3378f255208391ad105d7e9760
+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
 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 f583671c1506..e19adec356fe 100644
--- a/net-misc/crossbar/crossbar-17.12.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.12.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test tor"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
index e146bb877647..29ce90de46a4 100644
--- a/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
+++ b/net-misc/crossbar/crossbar-17.6.1_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild
index 3d83b60f86ef..4520fa8a4f1a 100644
--- a/net-misc/crossbar/crossbar-17.8.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.8.1.ebuild
@@ -18,6 +18,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test tor"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild
index 393fe4e08568..5218923f9413 100644
--- a/net-misc/crossbar/crossbar-17.9.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.9.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test tor"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
index 0e5de6b82bcf..f90a14aa47c8 100644
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 0dfd56f8765d..ea15d67daf79 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,5 +1,5 @@
 AUX csync-0.50.0-gcc_5_and_8.patch 1346 BLAKE2B 55c78622122e429b5a72790c5db3b0e2e063f419ab85dac460541aac121bf8d957a2be443837023e745c71debfe908a8fd5f75d041b16f7c22610da9e049532b SHA512 fb739031b2eca4f69f1384262214b13d5ccfd0abc64d889bb1b69f3a04473a43129ed26990aebcfd51e5b98b70649d9fac36a7eb116d162631f074d60ea82a41
 DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
-EBUILD csync-0.50.0-r1.ebuild 1130 BLAKE2B a9e58b3350b243415498d64c5c050f25f859e9fe1f95c81ed5e1f2b49e5016a93fc216c30800c55b6da37614f2de3614910f328c57a4daf750e1bd51b7f60bff SHA512 f563547196e0f0587827a83c6dd939510f3635f8c2ba5b60e7e8b059f360328324e1269a2f971c34632e623f120b4cbc2bec903505427eeb8db68670916170c5
-EBUILD csync-0.50.0.ebuild 1202 BLAKE2B 1332fa048c525811d42889ae8a36e7a3b02faf815455b0e9d274d705c13d29ee47818fde2b529e5fe75a8935528124272dcc0bfce4eb7c8290a66da0444f6b96 SHA512 ac9d02accd433cc1b07675503c3104416a6e948c0e5be52ebf0ca794749db68d5253b3ddf51b1bfa75f6cece33e5e7d48cde4c828812db39a2956926a369b36f
+EBUILD csync-0.50.0-r1.ebuild 1157 BLAKE2B f33db5654367764c3ea7b38ea00f80551daaf36df59288fd1dfde135fe8dca52ecb836c3171bb85fca5d478b1f73f2a7f2ca7188632f251d81b304498cfabce0 SHA512 86a5f1eef0f446f6def4c2fcbbe38ff74d73ea15c5a4de65e88b33c919475a90b5dc26206de030dd3a108f64f01fc89ddace5514579915ca86f8ee4db5635939
+EBUILD csync-0.50.0.ebuild 1226 BLAKE2B bcbd312e3b7ee18047220fa5a9e842c6de59dc2fe3c9933842b83e53a02446a2e032f77b9b688af4fcce95b9f199cbcaf08ec5c0d720a5f451d7a0029af77149 SHA512 1eddc1503d07bc2d0b43002c9288b260dbe425df100222a613179085e67395f9204ff46e88b5dc83eaba5430df0a5078308ebcf049818c2c287417951b6f67b4
 MISC metadata.xml 354 BLAKE2B 5a0ff4b19f98eefe67e4b6dc04ea59cdb76abfb4f8799163cf2c87a565660e84182ca565eb641b43b66083d9d9dde12cb156edc84b06e889edf0cc9a60e07d68 SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba
diff --git a/net-misc/csync/csync-0.50.0-r1.ebuild b/net-misc/csync/csync-0.50.0-r1.ebuild
index 5374066247df..4439f480f684 100644
--- a/net-misc/csync/csync-0.50.0-r1.ebuild
+++ b/net-misc/csync/csync-0.50.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc iconv samba +sftp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-db/sqlite-3.4:3
 	net-libs/neon[ssl]
diff --git a/net-misc/csync/csync-0.50.0.ebuild b/net-misc/csync/csync-0.50.0.ebuild
index e94ffa92f273..188fcabcab5f 100644
--- a/net-misc/csync/csync-0.50.0.ebuild
+++ b/net-misc/csync/csync-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc iconv samba +sftp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-db/sqlite-3.4:3
 	net-libs/neon[ssl]
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 3177db994c05..7cb79323524b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -8,5 +8,5 @@ DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164
 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.ebuild 7603 BLAKE2B a4541d17a9204d4407dc801cee9fe9a2bb3fa5ef79a13e1d00d48cdb06c809688bab0c64b079f89fbf9bff1191b305912dd0aa052e85d56e6683bd9c0afd01a1 SHA512 167e2ed770929ef5e77bec3aac33b4e8d3c77aa301acd30d7b25ca7fe815e266872a8d5fc2dd7e925b90a0515d313e7489ce81295e3fd624861a0f171fd40668
-MISC metadata.xml 1294 BLAKE2B 2908425a7e08af48dfbe009fa1ed435339cdec92297500b62bd7a086db0911f271c173bce19c2ffc301f0694858d1ffa19a6140fa1e2f80713a709cc418fa73b SHA512 5285b65f142c11ee78166ddd6d2d73c206fd2639ee906d1c077c761d5f5e2c5139c14c5c5cdf207a476f9d500f31c745cfb6fbde7a0dc35bf3e99e5f4e52075e
+EBUILD curl-7.67.0-r1.ebuild 7591 BLAKE2B 49b533d4b4176b495b983e0e149934e3ae2ec694c2eeb8be7dd81c412ee7e4409243efca5ef01d395d8d46b78c9f6ad346b6d6bd35acb7e90393a2169b3b4106 SHA512 c633b9884c895558407cdaedd89bd1d71cd43bd9db97c7fc7952e2d6acad016115364a6da798b6ceb88d5e9880373041c25a53c943e35c01757d2cf9dc4bfb09
+MISC metadata.xml 1219 BLAKE2B 981090b46e9e66661074be920692e688ebd351ad1770b3a1b76ac6f3b6cc66c70c370031affdf5f72b2141e04ab7e4e073b4bc1fcd0295624e14a929cc3714d1 SHA512 9f86ffa85c0ac69c7289a97a92d5e592a17e5cc23b62be980540cdc8702cf6151361be4f171446fca317d2dcb1c5879ba8ae1ad0b0d99ffb54366ca35df4052d
diff --git a/net-misc/curl/curl-7.67.0.ebuild b/net-misc/curl/curl-7.67.0-r1.ebuild
index 3926522208fd..82221e8ad5e0 100644
--- a/net-misc/curl/curl-7.67.0.ebuild
+++ b/net-misc/curl/curl-7.67.0-r1.ebuild
@@ -12,7 +12,7 @@ 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 esni http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
+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"
@@ -162,7 +162,7 @@ multilib_src_configure() {
 		$(use_enable alt-svc) \
 		--enable-crypto-auth \
 		--enable-dict \
-		$(use_enable esni) \
+		--disable-esni \
 		--enable-file \
 		--enable-ftp \
 		--enable-gopher \
@@ -239,7 +239,7 @@ multilib_src_configure() {
 	fi
 	if use quiche; then
 		libs+=( "-lquiche" )
-		priv+=( "libquiche" )
+		priv+=( "quiche" )
 	fi
 	if use nghttp3; then
 		libs+=( "-lnghttp3" "-lngtcp2" )
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 3cc29ed2f5d1..b62cf6ee3c7c 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="alt-svc">Enable alt-svc support</flag>
 		<flag name="brotli">Enable brotli compression support</flag>
-		<flag name="esni">Enable Encrypted Server Name Indication support</flag>
 		<flag name="http2">Enable HTTP/2.0 support</flag>
 		<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
 		<flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag>
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 1b05b1ba4c8d..4f7482cddf21 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -5,12 +5,15 @@ DIST dropbox-lnx.x86-83.4.152.tar.gz 94612498 BLAKE2B ddf86853785ee4806cc96f2427
 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_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
 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
diff --git a/net-misc/dropbox/dropbox-86.4.146.ebuild b/net-misc/dropbox/dropbox-86.4.146.ebuild
new file mode 100644
index 000000000000..c21396bd015d
--- /dev/null
+++ b/net-misc/dropbox/dropbox-86.4.146.ebuild
@@ -0,0 +1,116 @@
+# 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/ethflop/Manifest b/net-misc/ethflop/Manifest
new file mode 100644
index 000000000000..d87c5ee4e590
--- /dev/null
+++ b/net-misc/ethflop/Manifest
@@ -0,0 +1,7 @@
+AUX ethflop-20191003-makefile.patch 350 BLAKE2B b268ad12b98a3333397906570ac261caf06761df6d195366be1a889baabee6a49d402208c01bab6d1fa816cae6caf0222a94bd691d977a86320886bf145f47ca SHA512 f160b0285864cfdc076b354cf5e5a7738e3d58d9a22d984ffb754d1616eea24d00b6c2f5854e495feddf59ea383b0acb81d284a611b2f4726f3106b6337a432d
+AUX ethflopd.confd 270 BLAKE2B f88ff41ed7b083b3251b0aed5612eefbb4e6d652f4ba7fcbae7dfbcf85fe072a478abdc07ff9051869a2fa4a9b9051749a138aef2d5cc79fc00b2dc341cb0b03 SHA512 d46fba4546f6146cd11cc2e161943ddd20720f78749664d72a0f14e3e012466d0d882bafcbba2794c6630c735cc6bf204e4e1baf90a98b892cc92c8debf8a318
+AUX ethflopd.initd 236 BLAKE2B 938ff83700a252586b83b4d3f209a71bafe3b9ec87e1fff8ac86ceecd00ddc245c2e74dc7f66aed940fc7fa858c027c7ea1482343f0c59e86aaba393ec9b16f7 SHA512 974369721f6da77da247bdac70e077f4b93323af4ccb3ba5db30e6901c5a6962007592dcece1650c1e6fec12be9b9c8088b42fddec3db2ecb506e044292a5b8e
+AUX ethflopd.service 204 BLAKE2B b97258123ec2ef1e9b556fe5f81c33c14b3bfac7a8a345ec4be75d1a12882acbbfd5eb8ad3f766395ef8d3e59a5e71cba338cc2fc43bd61928f01b250a242752 SHA512 83a0421825835c35d0f0c7244e2d444002bde0459ed0aa3e4589aba67a6a7758958a7b8087ec9a181e37f8d5af428d53a06957ed0d5e099a63f9e9dc600c2efe
+DIST ethflop-20191003.zip 29858 BLAKE2B e5a4068d45c398d6c7bfd08299b57566c3d30bea4ef79692cae065adb61f3c41fd3ed568260e82e19d90e17c7b6d92c0698bb7f7c40edea9d44804a7a61e18ae SHA512 808e65d45e2ff74380bc2f1a31b7bb59fdca4acdf44eb7f60deef9aa0976462ddc64982e8a7b7c225d7f88e11a33dfcdf73fd7169f942018976d4d086e7ec477
+EBUILD ethflop-20191003.ebuild 795 BLAKE2B 0f3664f48a2585f33b33fbc3ab13ba29d118cda2a4d26bcd3631185aac226a35618af030d65dcb7467907b18e5a0c4c107cc3c04e6685eb078bd97388e3e7458 SHA512 fd60d9585705cb0cec7614bfbbd491509a9163652f51af26d17c810c4a0ecf6e3d4a2d4d634b86e92879b17cdced489fb92536f96a6e9cbc2f0e1546bb3b43e5
+MISC metadata.xml 1004 BLAKE2B 7180c03af4f161c41f3acf22dc218405837c04802890770fd2acde2130af5ed73d1e445ea9f9634856ac88fb5ace65b74e9323fb64f8626afc03516867322658 SHA512 90869b4e0606a66705500611fef60372426a830a1afd1df05b4717fb4176e17b53c6d0fad2822161ebf5f4cec3f53d8ea0b325c8ec1c30b7734b7f874764217e
diff --git a/net-misc/ethflop/ethflop-20191003.ebuild b/net-misc/ethflop/ethflop-20191003.ebuild
new file mode 100644
index 000000000000..f0b9e708f26e
--- /dev/null
+++ b/net-misc/ethflop/ethflop-20191003.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="A network-backed floppy emulator for DOS"
+HOMEPAGE="http://ethflop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tsr"
+
+BDEPEND="
+	app-arch/unzip
+	tsr? ( dev-lang/nasm )
+"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+S="${WORKDIR}"
+
+src_compile() {
+	tc-export CC
+	default
+
+	use tsr && emake tsr
+}
+
+src_install() {
+	dobin ethflopd
+
+	if use tsr; then
+		insinto /usr/share/ethflop
+		doins ethflop.com
+	fi
+
+	newinitd "${FILESDIR}"/ethflopd.initd ethflopd
+	newconfd "${FILESDIR}"/ethflopd.confd ethflopd
+	systemd_dounit "${FILESDIR}"/ethflopd.service
+
+	dodoc ethflop.txt
+}
diff --git a/net-misc/ethflop/files/ethflop-20191003-makefile.patch b/net-misc/ethflop/files/ethflop-20191003-makefile.patch
new file mode 100644
index 000000000000..7005dfdbb44b
--- /dev/null
+++ b/net-misc/ethflop/files/ethflop-20191003-makefile.patch
@@ -0,0 +1,13 @@
+--- a/Makefile	2019-10-03 23:02:15.000000000 +0200
++++ b/Makefile	2019-10-15 08:31:49.541999473 +0200
+@@ -14,8 +14,8 @@
+ #CFLAGS = -O2 -Wall -std=gnu89 -pedantic -Wextra -Wformat-security -D_FORTIFY_SOURCE=1 -Weverything -Wno-padded

+ 

+ # production

+-CC = gcc

+-CFLAGS = -O2 -std=gnu89

++CC ?= gcc

++CFLAGS ?= -O2 -std=gnu89

+ 

+ all: ethflopd

+ 

diff --git a/net-misc/ethflop/files/ethflopd.confd b/net-misc/ethflop/files/ethflopd.confd
new file mode 100644
index 000000000000..a727dae4c726
--- /dev/null
+++ b/net-misc/ethflop/files/ethflopd.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Network interface, which should be used for serving floppy images
+INTERFACE="lo"
+
+# Storage directory, from where floppy images are being served
+STORAGEDIR="/tmp"
diff --git a/net-misc/ethflop/files/ethflopd.initd b/net-misc/ethflop/files/ethflopd.initd
new file mode 100644
index 000000000000..d00c63f980ae
--- /dev/null
+++ b/net-misc/ethflop/files/ethflopd.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="ethflopd daemon"
+command="/usr/bin/ethflopd"
+command_args="${INTERFACE} ${STORAGEDIR}"
+
+depend() {
+	need net
+}
diff --git a/net-misc/ethflop/files/ethflopd.service b/net-misc/ethflop/files/ethflopd.service
new file mode 100644
index 000000000000..2b6c31902ec6
--- /dev/null
+++ b/net-misc/ethflop/files/ethflopd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ethflopd daemon
+After=network-online.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/ethflopd
+ExecStart=/usr/bin/ethflopd ${INTERFACE} ${STORAGEDIR}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ethflop/metadata.xml b/net-misc/ethflop/metadata.xml
new file mode 100644
index 000000000000..39fb8e66398b
--- /dev/null
+++ b/net-misc/ethflop/metadata.xml
@@ -0,0 +1,22 @@
+<?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>
+		ethflop is a DOS TSR that emulates a floppy disk drive.
+		The emulated (virtual) floppy disk is, in fact, stored on a Linux server as a floppy image.
+		All the communication between ethflop (the TSR) and ethflopd (the Linux daemon) is exchanged over raw Ethernet.
+		No need for any network configuration - the DOS PC only needs to have some kind of Ethernet adapter
+		(physical or emulated, for example through PLIP) and a suitable packet driver.
+		The Linux server and the DOS PC must be connected to a common Ethernet segment (same LAN).
+	</longdescription>
+	<use>
+		<flag name="tsr">Build the TSR program for DOS, which acts as a client.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ethflop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 3e2ff3909178..9ead5bc98b42 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 2551 BLAKE2B a24f06ab3ec1df9775820e41f43ea248a0a87fbf3059fbc32dc4769991288ee808a5216c5268d40519e9e36b6614c893942340533a80db86d9df8160dfb08809 SHA512 10380d0efa56e13914e2b2c0d7c6e58f1b682294be9d8e1c7352b9c56c0bc141c427b7ae4cadcbb77fecd35d2de9a118fd65dd693a1e71afe356b75adf989d6f
+EBUILD eventd-0.27.0.ebuild 2578 BLAKE2B d68a65ea250e4c645589b39a81fe6741fc94a1558b31f68ddab57349bf3092c45faf74bdf831f7612f0b109bff5373404fe6e4beb56e6ce4c016a51d861d0ccb SHA512 518ecc6191e0ab9324ed678f7739f3310a397079682e2fb6d2fd930cc80d59d89088e43afeec4b22f8864a55f22bb9656ea83873e2d4f8d4dd39d7b350f25ed9
 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.ebuild
index f4197d8b68a3..3ddb82d0f980 100644
--- a/net-misc/eventd/eventd-0.27.0.ebuild
+++ b/net-misc/eventd/eventd-0.27.0.ebuild
@@ -16,6 +16,7 @@ IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
 	pulseaudio purple speech systemd test upnp wayland webhook websocket
 	+X zeroconf"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	X? ( notification )
 	fbcon? ( notification )
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c964fcfe5d4c..16774ba4a927 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,10 +1,7 @@
-AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b4f5856b64899b14c97a76d685c8a663211aca51018e77cd3c8ba30e24203dcc895dcdb830f324353a2b8edc43aae SHA512 01a4d68493709352faf62d222b62e0368fca368f2b6e9ffff648af999d419675ab02fad2c8a9a9fb6149abca9bedbe35a35018dbeb82784d993fd09e3df62ab2
 AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa1fb0dcc01189964e252fc2fa190f4dc05b13a20302bc5921c4c0344e732539a560c11fd5800d661a518d99fdec68698 SHA512 cdd2a6c3524e717d68d3f386d666cbf81e53e956b8f2a5ae1b37e89c32e334e847255f3a4b77cb4b4b9bbe7f831ec4fe2ce87d5a49b11d7a452affd7083de21a
 AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
-DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 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
-EBUILD freerdp-2.0.0_rc2-r1.ebuild 2689 BLAKE2B 7f94bd2bcf14b1a0b73e5180bb11bd85dc86e0dab5af329944ecf3772b52c73c49731f8e6166afc1f69090d4adee586575e11caed0462f0b40a89d58761a31cd SHA512 b33ff3f59ac78245b34cedff771fb211c9bdeb99964391e9f722c3cecbc153b30e6e4d63e9c36fd993c945ef52e9b21ee5616a7c1eb06814727f805e7555d16e
-EBUILD freerdp-2.0.0_rc4.ebuild 2973 BLAKE2B e0f4c84a47743017f000e33f244ad0f161f07e225e012531aa23822afc8543894b531d9cfb2df52e967ebd563c4a5ac814043222cc10c158194929f471c65996 SHA512 ebd3c520e895ac6c7cce0c1610794ae604e5b11e9a11f01d4e6a8ce345a6529fd07341bc84e304b8ae005d1500a8f89984438c37d547a0fbd3b94d7131dda861
-EBUILD freerdp-9999.ebuild 2675 BLAKE2B 062df07d0bd6c7274aa1433c8c2067e653cbd5e563956e226bcdd97012bc9b938667970e2d74e5f3ef06a6a056b855745cfb77e38fd2de9c5b21d98f4c301659 SHA512 f8f5458aedbf4fb7693c8b2630078c43473d1b088c6aecd9ce8ed553b95783d67575893d1acf8eddc4fcdc42a607e26a722b1f213bbe01479f913850fa086d73
+EBUILD freerdp-2.0.0_rc4.ebuild 3000 BLAKE2B 1b80dee002f09b3a77eebecae80535944d1f37d427e27b04d9556a6d8803b9cebbea728a46e681a0db1cbdf6bff1af86f8bdc9ecc40cf0673e6a540673b1dfb3 SHA512 16659cbbfb54506ea7e94cb76400e7c2e4592f39b785e66d40e7930441de28477317ae293b9908d844094634ed58b88a3d5982fd6ed07b8c473498d130169bc0
+EBUILD freerdp-9999.ebuild 2958 BLAKE2B d6bdbc6c4f93ca0cf0a5552cb8df38da2ed6072e73956acabb9ea2f09e09fcdc372d4c374cf52bd6f1a27015ab1e94db8976dbbbf720b4469c4ab3aa03e9f2b9 SHA512 504105d55395458877e5d0ad5a0160a83bc9569cc3dfc04ae5b280a5acdc3c440ff8047cc25e79f04e11583862398fae7fc0927ba67a90eca4cd1f10ffb4639c
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
deleted file mode 100644
index a82dec1ad0fc..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 16 May 2018 16:15:50 -0400
-Subject: [PATCH] primitives: ensure primitives_get() returns a populated
- struct
-
-Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658
----
- libfreerdp/primitives/primitives.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c
-index fd236df6e7..d25c5b41dc 100644
---- a/libfreerdp/primitives/primitives.c
-+++ b/libfreerdp/primitives/primitives.c
-@@ -28,10 +28,12 @@
- #include "prim_internal.h"
- 
- /* Singleton pointer used throughout the program when requested. */
--static primitives_t pPrimitives = { 0 };
- static primitives_t pPrimitivesGeneric = { 0 };
- static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
-+#if defined(HAVE_OPTIMIZED_PRIMITIVES)
-+static primitives_t pPrimitives = { 0 };
- static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
-+#endif
- 
- 
- /* ------------------------------------------------------------------------- */
-@@ -74,8 +76,10 @@ primitives_t* primitives_get(void)
- 	InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic, NULL, NULL);
- #if defined(HAVE_OPTIMIZED_PRIMITIVES)
- 	InitOnceExecuteOnce(&primitives_InitOnce, primitives_init, NULL, NULL);
--#endif
- 	return &pPrimitives;
-+#else
-+	return &pPrimitivesGeneric;
-+#endif
- }
- 
- primitives_t* primitives_get_generic(void)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
deleted file mode 100644
index 7e5cfb6e5906..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-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"
-else
-	inherit git-r3
-	SRC_URI=""
-	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"
-
-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= )
-	)
-	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}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/2.0.0-rc2-primitives.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 2e2b4e41b520..741e74e65869 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -23,6 +23,7 @@ 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= )
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 78014fa99063..0bc7c2735df1 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2011-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit cmake-utils
 
@@ -12,7 +12,6 @@ if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
-	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
 fi
 
@@ -21,7 +20,8 @@ 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"
+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= )
@@ -49,6 +49,9 @@ RDEPEND="
 		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
@@ -79,7 +82,8 @@ RDEPEND="
 		x11-libs/libxkbfile
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	client? ( X? ( doc? (
 		app-text/docbook-xml-dtd:4.1.2
@@ -89,28 +93,30 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
+		-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)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
+		-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-utils_src_configure
 }
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index c8d336145702..d7954477ad40 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,8 +3,8 @@ AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-DIST gerbera-1.3.4.tar.gz 2893706 BLAKE2B a7356bf4d44f28a00cb7101240c50c913a48690c47aff159f42d4930daebc87cb35a51eae21e06c08a49d1495dea1b9203e61b157fd7935fde0eec782f933f68 SHA512 5ef81bcfcf83302133b6d99bbfb0ca0f46520128be1f086d175aa5e4533a7dbfeaeb70f249a71e848bab8951789fd50c4bd07a05792a9fcfe24a617ddbc2361d
+DIST gerbera-1.3.5.tar.gz 2893767 BLAKE2B eb4be515a4a2a3d1f10b8bff5737272355403faf6ed1fc8243c7d199e022e9c1bb7e756d6dc2c93a1730f48347d0c1f0ab05e0d3dca7eed7ba7bcbf1c16ac794 SHA512 8a5809684cd4997da8b5cf2db644f220e3688bcb0ba3bfa6c358e74fc950caec9ddafa78eab4369c64d39d8b7512f49a58954643790a8e4c40c54cccb2680a80
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
-EBUILD gerbera-1.3.4.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
+EBUILD gerbera-1.3.5.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 MISC metadata.xml 1142 BLAKE2B 000fa449f9dff3541b6d1507e6945a2508c0478ac19ed4a1ff1108ecde9dbbad96b76d304da9f34a2169bdaf620be5d710b111e0c442e05c94ab58747a7dab87 SHA512 28acbb3ef7011c52e77a323a4ec346ca25a3c255f8dc41da4c4c6c8f21bcbf0fcc8ebef501efd0f225ac2f0d29d828584a904774d7fb061635b007a0ea123f54
diff --git a/net-misc/gerbera/gerbera-1.3.4.ebuild b/net-misc/gerbera/gerbera-1.3.5.ebuild
index 1b1129c47251..1b1129c47251 100644
--- a/net-misc/gerbera/gerbera-1.3.4.ebuild
+++ b/net-misc/gerbera/gerbera-1.3.5.ebuild
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
index 150d249b1f52..99cdeff97a6b 100644
--- a/net-misc/hashcash/Manifest
+++ b/net-misc/hashcash/Manifest
@@ -1,3 +1,3 @@
 DIST hashcash-1.22.tgz 195193 BLAKE2B 2944dd8a852720af7deff1a85cbfc07e828bf2242996b95d8d05a3a8a3ece90abc47483252920ec14b603978aae2ddb9e770ef7b52904b3d24320b68e6695b37 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2
-EBUILD hashcash-1.22-r2.ebuild 657 BLAKE2B c56df7be355d2c380dbc9c0d48c49dbe95d0de9857274f0c126aacb8c166677cb0b51e2c305d79e1f9eed83f9a1c59ab9808dea9e054216b1695c77d3521720f SHA512 381ebc6501729f1504784dbebdd104755109ba22a59452fb3cfb63677dc0065cb9f9b7048807f775a3d6249b86aca94727a94b8fe043c73a6d898fb719dc6854
+EBUILD hashcash-1.22-r2.ebuild 650 BLAKE2B b5db1d10663185b0413120f94f394d7758796a2e2f7ef9101194f850bfadff2673de5f5ac21ca37aa6dd718f882c40e8b5fe038dc0447050dbb69d29d1505c60 SHA512 b977fb72b9d6bf9f4490079e6e51bb10a7ec6d193d51a0baf3836505038d11ab92157a348f002fca61de6111a6aef8be531d56a2d86c7c42f5e8e4b02db18072
 MISC metadata.xml 367 BLAKE2B c8709da086e6c51fe3535a4e70e63f671f47b9c5cf79e3d12becc98c037d858d4f9e2d34e05dfe534a774cfe1cf87b93e00eed956fc02342d06e64515ef1a7a0 SHA512 4f1cd259215742388e22ef660d3386bd9c887a96269989e18f8390a04c5ad1ed832cf4765b37453769808bc52eebbb72043c120aa5191601d1fb8754ce020fb0
diff --git a/net-misc/hashcash/hashcash-1.22-r2.ebuild b/net-misc/hashcash/hashcash-1.22-r2.ebuild
index 1533c90bd7b5..e29148642453 100644
--- a/net-misc/hashcash/hashcash-1.22-r2.ebuild
+++ b/net-misc/hashcash/hashcash-1.22-r2.ebuild
@@ -19,7 +19,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" generic || die
+	emake CC="$(tc-getCC)" generic
 }
 
 src_install() {
diff --git a/net-misc/hsc/Manifest b/net-misc/hsc/Manifest
deleted file mode 100644
index 0dcc1d08bafe..000000000000
--- a/net-misc/hsc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX hsc-1.0b-cflags.patch 1457 BLAKE2B aa575a633dc3eddc9c300e7ec9cdc014c2d50fa9c1f64a35cf5da7a6a1382a17604b88c0a0cf18e6e52d607b4920e1eef537611ee3f5ce50d0cb12afb8d799f0 SHA512 064783365d4058b6ad163958e2bd7e643000dc1f19a97a97b6aad9fef24165614ad965796cb689a6ee443dae017e8f64a807fe12fd734a1e16f886e23c6ca187
-AUX hsc-1.0b-glibc-2.10.patch 352 BLAKE2B 1fc9ea61a72688031ca403733141e3f43052940f23a6b1290fd5942c7b42a1bfa6bbe0e99b16ab63f5ab1da4a0f98dacb0df27de84621f5d8a2a73dbadd36dfb SHA512 99310e6574f073dfa3112503a2a8bd5c91c5e28985f885c5626a6e97bf5b3ac4bc6f44804412e7a5980aaf4ee9db41e3d65317a01138893806e12f3f9878c75a
-AUX hsc-1.0b-nostrip.patch 709 BLAKE2B 7d2dd4a6fad1bb091ed866750a2c8bd06dfa5892d14700b59e5e17e913e37862b1f5e4096e11ce079d1a57b73589bf4d602f685770d517c8e12c0ad5b023a431 SHA512 e20880fa90f2ce359c9c92195019649880b601c3eb9e41770ba403bd3ffedc397e24bab8edc046d2d75c8d2a41bb09f8c4861bc1c229e62c6492a8cd7d1bd5b5
-AUX hsc-1.0b-parmake.patch 315 BLAKE2B 415e1a9fda7bf07e05f9d7dc0cc55afea6abe923789e9ee7e90ea057a709778419349ffad986a2160a826228877cf3013c40236066aef88da225a1e55d5b0fde SHA512 33c4e194eecb5a6ba62cf88ff459283f54fbe632dc9e42234dbbf26862cecd9793268d481d57bbbc2daed7a3a606879f1f963b36c3ec7d13a4f519ff9da98426
-DIST hsc-1.0b.tar.bz2 623192 BLAKE2B e929178543beee5b75d1464ba7bb27eda5c0885b58b51c633f7c2f495cbe4ed36745c99b5e84ae763987b5d02aab9652ab880ee5ead6e0c16983b11824da60b1 SHA512 2fec8eb932f30b6e46a4f87c2baa2d3070375a068bcdf57ee5dbbbe3839d11b18a376ddde3d66751a4b35099d37007334c2a9183e05393cc3ac31481cc75fe97
-EBUILD hsc-1.0b.ebuild 881 BLAKE2B 164071c3d4c1689188860ba310d597964c45836a675858f7d5ccc5032d8e4c244899f31597ee83266518ca82a9e80fae464be0372e38b977bf8920e5c9e71b80 SHA512 cc82de4cbb6330eed461435afc5e5d5e36840a092c9be4f7739a7e0324a93ccd3ae4a58c21155c836ef5b333eead099e906b9c627aaa9692bde56e7d17397d8e
-MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/net-misc/hsc/files/hsc-1.0b-cflags.patch b/net-misc/hsc/files/hsc-1.0b-cflags.patch
deleted file mode 100644
index 1459d5ad049a..000000000000
--- a/net-misc/hsc/files/hsc-1.0b-cflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: hsc-1.0/configure.in
-===================================================================
---- hsc-1.0.orig/configure.in
-+++ hsc-1.0/configure.in
-@@ -46,12 +46,12 @@ case $host in
- 	;;
- esac
- echo "Configuring for $SYSTEM"
--CFLAGS="-Wall -pedantic"
-+CFLAGS="$CFLAGS -Wall -pedantic"
- 
- AC_ARG_ENABLE(debug,
- 	      AS_HELP_STRING([--enable-debug],[Compile programs with GDB support and debugging output]),
- 	      [CFLAGS="$CFLAGS -ggdb -g3 -DDEBUG"; REGEXDEBUG="regex/printchar.o"],
--	      CFLAGS="$CFLAGS -fomit-frame-pointer -Os")
-+	      CFLAGS="$CFLAGS")
- AC_ARG_ENABLE(efence,
- 	      AS_HELP_STRING([--enable-efence],[Link with efence library for memory debugging]),
- 	      CFLAGS="$CFLAGS -lefence")
-Index: hsc-1.0/src/regex/Makefile.in
-===================================================================
---- hsc-1.0.orig/src/regex/Makefile.in
-+++ hsc-1.0/src/regex/Makefile.in
-@@ -29,7 +29,7 @@ version = 0.12
- CPPFLAGS = 
- 
- # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
--CFLAGS = -g
-+#CFLAGS = -g
- 
- # Ditto for LDFLAGS and LOADLIBES.
- LDFLAGS =
-Index: hsc-1.0/src/Makefile.in
-===================================================================
---- hsc-1.0.orig/src/Makefile.in
-+++ hsc-1.0/src/Makefile.in
-@@ -27,7 +27,7 @@ DATADIR=@datadir@
- 
- CFLAGS	= @CFLAGS@ -D@SYSTEM@ -I.
- COMP	= @CC@ -o $@ $(CFLAGS)
--LINK	= @CC@ -o $@ $(CFLAGS)
-+LINK	= @CC@ -o $@ $(CFLAGS) $(LDFLAGS)
- LINKLIBS= @LINKLIBS@
- MOVE	= mv
- COPY	= cp
diff --git a/net-misc/hsc/files/hsc-1.0b-glibc-2.10.patch b/net-misc/hsc/files/hsc-1.0b-glibc-2.10.patch
deleted file mode 100644
index 5c10efc0f9a2..000000000000
--- a/net-misc/hsc/files/hsc-1.0b-glibc-2.10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur hsc-1.0.orig/src/hsclib/css.c hsc-1.0/src/hsclib/css.c
---- hsc-1.0.orig/src/hsclib/css.c	2006-04-03 17:18:37.000000000 +0300
-+++ hsc-1.0/src/hsclib/css.c	2009-08-09 20:19:51.000000000 +0300
-@@ -129,7 +129,7 @@
- #ifdef isblank
- #undef isblank
- #endif
--static int isblank(int c)
-+int isblank(int c)
- {
-    return ((c == ' ') || (c == '\t'));
- }
diff --git a/net-misc/hsc/files/hsc-1.0b-nostrip.patch b/net-misc/hsc/files/hsc-1.0b-nostrip.patch
deleted file mode 100644
index af4cc947d8fd..000000000000
--- a/net-misc/hsc/files/hsc-1.0b-nostrip.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: hsc-1.0/src/Makefile.in
-===================================================================
---- hsc-1.0.orig/src/Makefile.in
-+++ hsc-1.0/src/Makefile.in
-@@ -87,10 +87,9 @@ rex:
- # installation
- #--------------------------------------------------------------------
- install : all
--	strip $(EXE_ALL)
--	$(INSTALL) -Ds hsc/hsc $(BINDIR)/hsc
--	$(INSTALL) -Ds hsctools/hscdepp $(BINDIR)/hscdepp
--	$(INSTALL) -Ds hsctools/hscpitt $(BINDIR)/hscpitt
-+	$(INSTALL) -D hsc/hsc $(BINDIR)/hsc
-+	$(INSTALL) -D hsctools/hscdepp $(BINDIR)/hscdepp
-+	$(INSTALL) -D hsctools/hscpitt $(BINDIR)/hscpitt
- 
- #--------------------------------------------------------------------
- # cleanup - remove all objects and executables
diff --git a/net-misc/hsc/files/hsc-1.0b-parmake.patch b/net-misc/hsc/files/hsc-1.0b-parmake.patch
deleted file mode 100644
index 8c93d32f4888..000000000000
--- a/net-misc/hsc/files/hsc-1.0b-parmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hsc-1.0/Makefile.in
-===================================================================
---- hsc-1.0.orig/Makefile.in
-+++ hsc-1.0/Makefile.in
-@@ -30,7 +30,7 @@ all: hsc docs
- 
- hsc:
- 	make -C src
--docs:
-+docs: hsc
- 	PATH="$(shell pwd)/src/hsc:$(PATH)" HSCEXTRAOPTS="IGNORE=21" make -C docs-source
- 
- install:
diff --git a/net-misc/hsc/hsc-1.0b.ebuild b/net-misc/hsc/hsc-1.0b.ebuild
deleted file mode 100644
index d00e110a46ca..000000000000
--- a/net-misc/hsc/hsc-1.0b.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils
-
-DESCRIPTION="An HTML preprocessor using ML syntax"
-HOMEPAGE="http://www.linguistik.uni-erlangen.de/~msbethke/software.html"
-SRC_URI="http://www.linguistik.uni-erlangen.de/~msbethke/binaries/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${PV/b/}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	epatch "${FILESDIR}/${P}-parmake.patch"
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	eautoreconf
-}
-
-src_install() {
-	dodir /usr/share/hsc
-	emake BINDIR="${D}/usr/bin" DATADIR="${D}/usr/share/hsc" \
-		prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" \
-		datadir="${D}/usr/share/hsc" install || die "make install failed"
-}
diff --git a/net-misc/hsc/metadata.xml b/net-misc/hsc/metadata.xml
deleted file mode 100644
index ffac4d7ebc01..000000000000
--- a/net-misc/hsc/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 type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 6df812994cc5..65628183847d 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,8 +1,6 @@
 AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe0ed55703dcd08d1a64f6211ed49d974a8d95599ba30f26930cfda4e929acee9f46982debfa531a9d6c848250a9c0ff04 SHA512 7382a271c2ccf7c270102a40724abb2e505070e3062c9ab8910c45ad5e52cc6190c7b24604e5b738674beef5b032cfc59c90d33d7db0962dd63ca61722c5dfb1
 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.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569
 DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7
-EBUILD httpie-1.0.2-r1.ebuild 1176 BLAKE2B 751f1e157f875752477bc5453de9e592bc39542ccdb998fd5fa14e34da14cfb04e9268742b101e9cc5efadb6087c58fa35a88c5bbd13c2e7bb55b541d37fc173 SHA512 be69977798c726337afeaf9447d800dd9141685894a446e7240ab7dd90c03612710aec61ab14d62c45701c6b8ca1870188eb087d283d04cd3f1a461eeaea0c08
-EBUILD httpie-1.0.3.ebuild 1269 BLAKE2B 35ffed56743e5115e1e7273296368e6c7c7419281ecce2544c983413e16e8fc16ad829900d8eb60870e2b49d5097affeca255075ffceec4746b3900d6006d67a SHA512 113b1f56570cc89988c39434071aeb5e43b666869d49a68ff958c22e227dac636c1f29d7c1134ad4bff71df8ca6fd616d3af6f5d682d2dc6fc099ac7bc9fdba1
+EBUILD httpie-1.0.3.ebuild 1294 BLAKE2B 8d9577f2b9d2a940f55bfbcbfd672084d489fb9fea641da9b0a588e90aa8117bc5f11e3f4fbf51cd521a078069b06a2a9ea68c6909c1ce81a79c59bbca6b0ef7 SHA512 5877d5884dff32f404cf787ef5f1a11be22ec55e62d5ab64b25f5d94d1c265bd351af6a7e82bee295a7134ec0024d893aea868643ea3e2e8567bae5c901f2ef4
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-1.0.2-r1.ebuild b/net-misc/httpie/httpie-1.0.2-r1.ebuild
deleted file mode 100644
index aac3979a8995..000000000000
--- a/net-misc/httpie/httpie-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Modern command line HTTP client"
-HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.19.1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-# Extend list of expected strings in test
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-test_ssl.patch" )
-
-python_test() {
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/httpie-completion.bash http
-	insinto /usr/share/fish/vendor_completions.d
-	newins extras/httpie-completion.fish http.fish
-	distutils-r1_python_install_all
-}
diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild
index 7849e8a95d9b..526bb639658f 100644
--- a/net-misc/httpie/httpie-1.0.3.ebuild
+++ b/net-misc/httpie/httpie-1.0.3.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.19.1[${PYTHON_USEDEP}]"
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 6168f7cfb2d9..c37bc2a3dbdf 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -3,4 +3,4 @@ AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62
 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
 EBUILD igmpproxy-0.2.1-r2.ebuild 602 BLAKE2B a5bef105ee2271b1801692825cb60274a498f91122d684e893ff0f487e3a07ecb6e9d6edf6c1326ae85c4ad178f9a4407e37944470b314561800177f2c5e3afb SHA512 964d744d22b1fcd627c0db393a11e4d5fc088ad442f783735078bac8cc06747dce7480c717e0e429ea4224fb5ff6dc58f0f3faa7cd840a79c581ab6a13e492fc
-MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
+MISC metadata.xml 593 BLAKE2B 29de61191b267e0b01464e3cd66e5d1b68deb0feba50b2ae1facb2909a04dbe56e8fb1b9188028bb11ba8fade7f750927e9cc24e2f47bf071fb775a4366deec9 SHA512 326ef6823232e5e8a11e173024a759d969ab190fa3c406063c8f59cdd1a6c33cbe3e1e4c070605e298d7bd3ec4d92c446edcc17dcc3c76660f9391235c1a4721
diff --git a/net-misc/igmpproxy/metadata.xml b/net-misc/igmpproxy/metadata.xml
index 37a86a4c127a..90bee07cf1dc 100644
--- a/net-misc/igmpproxy/metadata.xml
+++ b/net-misc/igmpproxy/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		IGMPproxy is a simple multicast router using only the IGMP protocol.
 		It is intended for forwarding of multicast traffic between networks,
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index a2dff4dfc5a5..8d85dff3c7e9 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -7,9 +7,9 @@ AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
 DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef67cbb0ce8050e30000465686466b30b699b2d8cb374be6b5a063ce220cb79e48fa8fd2257cce69cd8a90e8 SHA512 4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7
-EBUILD iperf-2.0.13.ebuild 733 BLAKE2B 0fe76b02bfd65802259451a710eb7aca53bf22cb3cca17f92e010d836ad2838400289585e15109e3be03dc44ea182ad47a25ed724d98cd0e1a7f93757178b871 SHA512 a85ac665b7597a0038ed8b1a04aebe3e212ff670cd104cebd85c9d9a2d9f893b55e2be25ebba54d3c67ef93969fccbd2a88493735fbbe886ebfb9edaaec8bd0c
-EBUILD iperf-2.0.14a.ebuild 799 BLAKE2B 28924ebdbe123cc3ebdcb32e625f3b0be6c3e6658c8a9b3b241bf71ce88eecdd87ffd0fa25f35eb6cdd5636c04f88d42aa3d48048ae5bfed3758d16a16e7717a SHA512 9e6800e21963bc12e4fbc2faf7fc6d2e5c1fa0faeab552f37b4a52c283bad4abcfb9297f11decaef63442ea3e1a536aeb74ac38449cc465470564e92db83658e
-EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c993bd71558c85327c292d8b302839b8c83e4814d37c30a567f2ca65570112cbdc9e2025ba48db78414c940cca1322f9 SHA512 c2f68699b11ac215a5819242435dfbe4df964f83c2b864d592b0795ec9506ada2ac7e41abefeaa152fee1138ed9ea0c13d3f200b403dff35b1b3eb70351a2122
+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
diff --git a/net-misc/iperf/iperf-2.0.13.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
index c941b6c92ae8..682e3053a3ac 100644
--- a/net-misc/iperf/iperf-2.0.13.ebuild
+++ b/net-misc/iperf/iperf-2.0.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://iperf2.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/iperf2/"
 SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
 
 LICENSE="HPND"
diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
index 406343d343c0..25750ac91672 100644
--- a/net-misc/iperf/iperf-2.0.14a.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://iperf2.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/iperf2/"
 SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz"
 
 LICENSE="HPND"
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
index 99746d3f101f..0e887f4a4e2d 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild
@@ -5,8 +5,7 @@ EAPI=7
 inherit git-r3
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://iperf2.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/iperf2/"
 EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
 
 LICENSE="HPND"
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index cb4108cd83ff..acb6ee569861 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -5,4 +5,4 @@ DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz 135584164 BLAKE2B d
 DIST IPMIView_2.16.0_build.190815_bundleJRE_Linux_x64.tar.gz 93629983 BLAKE2B 7be066184a6722b7fae87a3427bd161092393662dbb9597188de913bccfe6df0050441d5180b434c8394438d98d37f77452a6eb9ad3cf6f654eb67f4cc7facaa SHA512 9a6af293a08dcdb662a226c061590e7149e5cee0a69eca12906e4581e254d3293d27e71dd36c301a449a43a10be700f3023f8408bdda5a3b9b65d76c96eaa3d7
 EBUILD ipmiview-2.15.0.190109.ebuild 2389 BLAKE2B 251caeefbe35ea4f88c6fb9f6c4dc3e3ac8beb992aab4fe91bd1037cd1ffdae21e4daee57af69a026e48715d7f9e3bb822482d408442eb72dfa81438233e2d4d SHA512 ec5dfc4088d33cfd70b704e263518424f26aba1c3c6ffe0ee4e43533cd60edf9f29e96a8480aab147e73439833a6180cdc817639b4a080278887acd0862c26fa
 EBUILD ipmiview-2.16.0.190815.ebuild 2202 BLAKE2B 7863a161c8d901fa4832c9b0510352371828cb573ef046eca2cc41c9bae63966d400651d026b6fb972ee0660382a91e1db70c9f7c2c411183077a00b08f9dc43 SHA512 9e4cff9887ee905d606167b17e3df9e1631057078f5c2e5b6baae0d243c0c157cf1ec5a615c21ef3760706240ff7fe76cb67d9e6baeba4060067b93dcb649893
-MISC metadata.xml 821 BLAKE2B 882be3c11acaf5ebd41e0047c3c465d4d704d0d87f38c4e130a2fbbf49fc47a75f0da778d9fef080643159a154b7c597888a322a09bb6a33ddd9e4fb684afbcd SHA512 b063bd259abc5c3c7a90a64e07f188d25ca8a98ffd7beecd30a4c4ba10f435845699cd0f9167f7e6a1250ed9e261193ad449684600eb8d33c662002d2da036aa
+MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce
diff --git a/net-misc/ipmiview/metadata.xml b/net-misc/ipmiview/metadata.xml
index c4509ff079b0..5aa0fb7fd7c6 100644
--- a/net-misc/ipmiview/metadata.xml
+++ b/net-misc/ipmiview/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		IPMIView is a GUI-based software application that allows administrators
 		to manage multiple target systems through BMC. IPMIView supports Supermicros
diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest
index 0bbaa7c65005..7c65fc62aba9 100644
--- a/net-misc/iprange/Manifest
+++ b/net-misc/iprange/Manifest
@@ -1,3 +1,3 @@
 DIST iprange-1.0.4.tar.xz 104336 BLAKE2B 8b2dc82de89e2de92e873afbb8bcd0c1a0f9200619726d482ceea435131c4d18454856d8f808a03711a0967128a539c0e3abd94d9f2762262e43eeed6c4b885e SHA512 28fa258c95e6a7b0bb304b8fee624cfd8ef1a5b24a98a80c3dafe44639e6dc0de22c3b61a33794533c3d9fc0ba41f5663a6bb6c85cf940d57c64db043ccbdac9
 EBUILD iprange-1.0.4.ebuild 313 BLAKE2B 2a46ca7f4d6c8ed584d464391d1a1f3d03ce5aaa02e1b1b2ae163780000cdbd88fde15c2bec2d5847f663107a7d6f35df95153504b11a7475412aa03e70ee67f SHA512 6275c12b3aa0fdc0375f79aa398eafa4444246d427c6cb592d9a52e65e4a218d42482261c578d8e0d5df5deb4e1880c8ce1a8a68583f2165e1c6b73e2fa6b730
-MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml
index 041c1966b76b..7a38bb900964 100644
--- a/net-misc/iprange/metadata.xml
+++ b/net-misc/iprange/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alonbl@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 257994ca6571..584fd0505a88 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,5 +1,5 @@
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
-EBUILD ipv6calc-1.0.0.ebuild 1518 BLAKE2B a0e0d68cc77ba1e2ca7ad31376e1e8ea25635fb745d1f1eb4ebd0ed9284de22b186e9410ad29d161becc204ddb4cde373fb3c38236e7366bc540f5567c5b91fd SHA512 2be8ead786d648ca451417666e208ba257ad509c28549ab86c93d2340c7491c3cdf3d1edc823cb70a8afcba83dfb6aada50ee103e2d79a836ba89af5cb092653
-EBUILD ipv6calc-2.1.0.ebuild 1560 BLAKE2B 8a73501730d20b225119c0d227ff3719a71a99371f6f22d6fe9e0a9ea0771223cb87f3c172267195c5f6cbe8e778f6c0413b486be62f2e4c8be96d842322a08a SHA512 402dab6ebeffb0e8049aa34eb93604dce5854ab0bea95915411fe500f2be90b1273455fc5129660de5fd6529e6819abd2c09525014b94e31ec1ad0e8ed5dda00
+EBUILD ipv6calc-1.0.0.ebuild 1545 BLAKE2B 20604959eec3564329c9deb173fd37d8a624ed474d5aec35efcf76dc9cb3f191eb7e70379ea942981b5cb9813bd19563cf8bd04cd307ef5e16d30bc535907f0a SHA512 4d0b6115980f57558cc2b44db4d71cdb97289e61fe80e19b7bbab07e302177af4c63b43a82c002beb41131614592595ee23b7d9ab13eb984485a8cf1e67d0f27
+EBUILD ipv6calc-2.1.0.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
index 995376c6640e..ff23d37cf910 100644
--- a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
@@ -11,6 +11,7 @@ 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:= )
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
index 898a06fd0de2..65630c1080ec 100644
--- a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
@@ -11,6 +11,7 @@ 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:= )
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index 52e5fcc94ce2..a92d8d0d4a8d 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,3 +1,3 @@
 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 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
+MISC metadata.xml 244 BLAKE2B 035fc01ea1319b6e276f4ed17501a22a91eece9091d776d034796e4368107ba196680cc9151de0e0cf545655630246fb93a5e43e301a8dca55d3607d80483a0f SHA512 bc817b979b26d8cb3f6202cd8207baaf0ea0776594471f97e2eacda02284b37c6bca5f84eba341b7a5b7155bb4bc5339480f38a3be259a0c7a6b7c004d1b2884
diff --git a/net-misc/istioctl/metadata.xml b/net-misc/istioctl/metadata.xml
index 25597e3863fd..d05357ae0503 100644
--- a/net-misc/istioctl/metadata.xml
+++ b/net-misc/istioctl/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->	
 	<upstream>
 		<remote-id type="github">istio/istio</remote-id>
 	</upstream>
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index ef3df8deab84..869e38d99cd7 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,10 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
-DIST kea-1.7.0.tar.gz 7155043 BLAKE2B 8d4e218a769089fbea98578289eadc4dd012c39c4513528cceb5f69dc07e622be8636b4ff8325eb38db2e8e301326172d50dc23f56ca401b55cb9e0c5016e618 SHA512 70fb303ee528d8c5611f723cdf0f68d7dbbda061ee963a3f5d6ec0396a986cdc36370dec48bd6483fbe9acb551b53ad377ea1be6cea0a97456db4352bc162d06
 DIST kea-1.7.1.tar.gz 7203950 BLAKE2B 40684401e39a5e95dfa1b6d899fe8c6a9e3418a65d3314215b287bb9898324a52b296292c7bdd11cfdb4d1d2f7f7c15c26a3f7999269672272486240f2d7cc28 SHA512 7c8ff3fb0bb53fcccf406660ad50593afa5f03328889c03791f6ac28dd41fbbec2094071d786f03b5cac96f887b48c5cca5c1d10a8922a1027279726458522d1
-EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
-EBUILD kea-1.7.0.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
+DIST kea-1.7.2.tar.gz 7229506 BLAKE2B fd84bd69e4fd147b91af80bb9094476bda3a3de0253c6f1880adde33458168f2dc24b6b95ed7b4f0d65fe69b2304bfebe8359e1bd61c28c9ba070e03531ee531 SHA512 f84bed2e1dacd172c7aed8e4d6c11ec5e79f37ad2c7991963fc9c4a1761668f9f0e105ba5c4deed06264ab2ec13b1b5787350d823de12fd3782223192e3653f2
 EBUILD kea-1.7.1.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
+EBUILD kea-1.7.2.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.6.0.ebuild b/net-misc/kea/kea-1.6.0.ebuild
deleted file mode 100644
index 2d0234c2da44..000000000000
--- a/net-misc/kea/kea-1.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql openssl postgres samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:0= )
-	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-perfdhcp
-		--localstatedir="${EPREFIX}/var"
-		--without-werror
-		$(use_with mysql)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_enable samples install-configurations)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	keepdir /var/{lib,run}/${PN} /var/log
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_preinst() {
-	enewgroup dhcp
-	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-}
diff --git a/net-misc/kea/kea-1.7.0.ebuild b/net-misc/kea/kea-1.7.2.ebuild
index c915fee4402e..c915fee4402e 100644
--- a/net-misc/kea/kea-1.7.0.ebuild
+++ b/net-misc/kea/kea-1.7.2.ebuild
diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest
deleted file mode 100644
index 8056a2f1ecfb..000000000000
--- a/net-misc/knemo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST knemo-0.8.0_pre20161211.tar.xz 408160 BLAKE2B 17653ff28e97596871d823180aa4cf108dea9e782ff1f1ed47290420ebabfa8ec22a9d4ef70194126679ed91e4267185b470b04e09088dcd013f416d166c6669 SHA512 5d035e8a48c528ddec9fa0e288cf65df2810516a9d545b1ca4e56b1e2e4369fe82baab355a4950791a515395275931f04db743f82d4e570ea012dab83e6ae22c
-EBUILD knemo-0.8.0_pre20161211.ebuild 1442 BLAKE2B 41e001277f96060baabec3723946447d561d053e8c6a2a78e54a63eb51596d4dc052132c767d93042266024e30da0bacadb06dcb3609007373fccaa854253156 SHA512 df8ead32758fb06d90095f9f6bd0fa713c40a13290e51986b885edb614e600b9ec4c9cc12c8326d1375f34d3df2a0cd870f72b98bb26b64e8c9d729e860b9b8c
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild b/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
deleted file mode 100644
index e7d9995f840f..000000000000
--- a/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Plasma Network Monitor"
-HOMEPAGE="https://kde-apps.org/content/show.php?content=12956"
-LICENSE="GPL-2"
-IUSE="wifi"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-fi
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libnl:3
-	sys-apps/net-tools
-	wifi? ( net-wireless/wireless-tools )
-"
-RDEPEND="${DEPEND}
-	!net-misc/knemo:4
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# unused dependency
-	sed -e "/KCMUtils/d" -i CMakeLists.txt -i src/kcm/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DNO_WIRELESS_SUPPORT=$(usex !wifi)
-	)
-
-	kde5_src_configure
-}
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/net-misc/knemo/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 type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 88b304073c18..b594cd8736a9 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,4 +1,3 @@
-AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
 AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34
@@ -10,6 +9,6 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
 DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
-EBUILD lldpd-1.0.3.ebuild 2540 BLAKE2B 5feb12c469fcc8b1197ae90b81b07384ba5d9562e8a8104f5e1e1f3f89c1a50aca0b4801cbd18e553bbb5db8aae0eb41a328e37050c22393f62382b700b600af SHA512 497abc9c43b915427ae051d522a613db865ea7d221fece4c005e416bbae69aff60b99ced62d372f4c6ea8728c92dc06256f35ee2c50f858afe9fbb5cc9b456a9
-EBUILD lldpd-1.0.4.ebuild 2522 BLAKE2B 301b2684c36504372139267a37b51523ce21fcb0d775413f0a0234abe6b1a716d2825ea30ef8d49e1dd6dec3094200931a6f0d31585f621656dc071cba60e914 SHA512 24480ce8ad674947232f640ca6c8a6962cf3f79b568e83b34be709d30acd331a2351f9c6db4b714fce2e2950df01567581e5d80bc9c8cad13da34b04353b0fb5
+EBUILD lldpd-1.0.3.ebuild 2567 BLAKE2B c738e953259ac8d9175d96da8914a3c7a194607bd0d26d3f7228a389cfcacd9173636403a5aa54ab19196e52231396496d3ca6b6e49864160fdf8a133b13db46 SHA512 1cfba79856d8988a9996b95515a79b1f13761e3e9817c8ed3f9eb2e605d4edb678e5f1bfd3797e3503ead272476d82d07d5ade4e184b84319c798a5a39b4eb26
+EBUILD lldpd-1.0.4.ebuild 2549 BLAKE2B 0e63a4b563b35ee90072bb756036300bf5ae2a53ee0fd7f9386e9a3c85ac4b0beec271e98adc8631eee38b3c86c11101e9ffa826afa738a8a787e5c941664689 SHA512 1d33c741feb750d164449cbf61978fd520a229e1180939a68b64233d76adbd605024520eb2d093bfc9836195ab62a8751c5ad95f9d48b9ba3819751ebfe83d30
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch b/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch
deleted file mode 100644
index 183306a90482..000000000000
--- a/net-misc/lldpd/files/lldpd-0.9-seccomp-missing-syscalls.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index bccd378..4f9e6e6 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -148,10 +148,12 @@ priv_seccomp_init(int remote, int child)
- 	if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(bind), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockname), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(uname), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(unlink), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(ioctl), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index df8005f63804..0951ecf8cc02 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
index 04dd3d66540b..b3e6c9c49fbb 100644
--- a/net-misc/lldpd/lldpd-1.0.4.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.4.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest
index 373291bf37c9..0daac4063586 100644
--- a/net-misc/mcproxy/Manifest
+++ b/net-misc/mcproxy/Manifest
@@ -3,5 +3,5 @@ AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c5
 AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95
 AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830
 DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb
-EBUILD mcproxy-1.1.1-r1.ebuild 1068 BLAKE2B ee41e2afe5fd00e59afd90fb84139a2e59400ca22b64b1e3a1a4b26026af0133c4be1d571b367c5404d98b69498f006c02945dc77b406eaba2821d023895aad6 SHA512 810433d5d8e9fd3dec8c03740d838083e718f5119a66f9de5e376053c6dfdb047d014e39ef437e2c3f598c5ba5f0d0f52ba9598e7c375769dbfd9b3ec98e310d
-MISC metadata.xml 1382 BLAKE2B 5c7f722ba8c8886c41ee6cd5fb894e60d259718cc33b1898049f71cff039872272b6120faae28378c4f3722e5cc97154577899141caf2c6c0792443a67dbaad0 SHA512 99b20c4f17439db3e04cb85c2355a2944353adb3015b627f9f91836d9ae49efa54d044e153ec73980cab04ee78bbf1c1a9e38bb132284b46fce31859a7c9a3f8
+EBUILD mcproxy-1.1.1-r1.ebuild 1066 BLAKE2B 52fd2c2d28eacc387f5bd63f91285896ad9faba1b0025a74888727703168649c2b9ee433b7102a0d74f651a4248380da7b51a936a6dfae561068862a03ed3f55 SHA512 ed386d1062d65be24b66c637129ef5ddb4801a918ffcba71600ec44155c13cbe653539eec553238d66a020fb0f0d175d2f468eb3e6a2e0935cac962a969b122c
+MISC metadata.xml 1263 BLAKE2B e3df52a90f366a1c7f6f754908f31455322c8b0da826ee1f121925a231c4f8cb74961ba9ca49607336310e5f7176ad8ff0610220a4888f2dcd004f2bce44ecfe SHA512 48e7b7051b9172bae3816e1e2737371a9253cff443a03953b373becc9bcaf152e63a341f7a97a00adae283aeab003cd0765514ba30988994a59570314ab00df0
diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
index b45f84ae1358..41a61a3847d5 100644
--- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
+++ b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${ED%/}" install
+	emake INSTALL_ROOT="${ED}" install
 
 	insinto /etc
 	doins mcproxy.conf
diff --git a/net-misc/mcproxy/metadata.xml b/net-misc/mcproxy/metadata.xml
index e601c26a3075..45c87079cd24 100644
--- a/net-misc/mcproxy/metadata.xml
+++ b/net-misc/mcproxy/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		IGMP/MLD proxies offer the possibility option to combine
 		local multicast networks with a larger multicast infrastructure.
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 0ca51a939686..4c3f6ddec8ec 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -10,5 +10,5 @@ DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c
 DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
 EBUILD memcached-1.5.14.ebuild 2930 BLAKE2B 1e47dcee14202eb3f7de51c779c5e6ddb9eea26fd743a362919fb6bf60e4d2333910b8eb1db13491f429eeb19d9451912e6ec1bdb753ee21eb7f2bdf90415864 SHA512 29986b6567a677dc7b9fb514a03966dc9f661ddfcc5e380118eb4e1b12d06601347149a8e4a97bfbdcbec04f6de243c2fd9201725017c562cb73bc407d79578d
 EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
-EBUILD memcached-1.5.20.ebuild 2940 BLAKE2B abcb695f6e2510d3e471d671a63e7603137557f7189a9eec1ca060dca67407a3fd1dc5b104d66978265c4bc3ec2e5b3b690440fe88d23d0dcedcb19b82a8d292 SHA512 ce50addf474089d4a901216fd4c0e936fdb469a6da0f6ab66e75328622b4b9c7f70fdc4a1bb011e30a7c6440cc01b56e3ae99fbd0a4fca88a398389de7775413
+EBUILD memcached-1.5.20.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.20.ebuild b/net-misc/memcached/memcached-1.5.20.ebuild
index 0a1da23139ba..77a0b3f38a8a 100644
--- a/net-misc/memcached/memcached-1.5.20.ebuild
+++ b/net-misc/memcached/memcached-1.5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index eddfafa356e5..f857476ddfb5 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,3 @@
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
-EBUILD mobile-broadband-provider-info-20190618.ebuild 441 BLAKE2B d9ded965878f821ed011f934132418729648413be881123bd91e48c6db1e25305f2b5393c10131d877c057958c79c50d45fa20b3ab381e74f9a16cf7207d39dc SHA512 1ef9872af4c53385124f30725daadeaf603aa1e78550f5cd0c492957bc9d3b9429b5da4403601cb8594dc44e3d56b0bb1c8c5d81a4f6e64b76719b7e5e42aea0
+EBUILD mobile-broadband-provider-info-20190618.ebuild 468 BLAKE2B 94c5b5b741ee1b67561e8863822aa46c597a5c08f129bd7214cefe33db12bff35de803f0609493e8e293d16f15fc95333448ee600844c111e2093159362250b8 SHA512 66ed3e297edb8c06ac979798f66128989297c858c5b535caac1eba83bdc21115137d16ffb215fc883928cd60843d0bfef37baa6c9aefbaa0741d232ba4f21b73
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
index 4b4321836f0f..3a762f11ef5b 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
@@ -12,6 +12,7 @@ LICENSE="CC-PD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libxslt
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 0a5a4fd9578e..e9752960c073 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,9 +1,5 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
-DIST mosh-1.2.6.tar.gz 347185 BLAKE2B 4676ebc9736d83eaf842ac847fb7ce29d0ebbe9546df9755fc03d352ee69edd0d2135bf232c42c77c37e66a69049682611ccd10ceba999c6b4b419c66e288813 SHA512 fe53ba3ba79fb393f9fd5d3c48b2864838a1b51a8e08f0160bcfb98fc8c2363d2bb77456e1bc79b765d6489a2af54237c5423ebb88a13196a82420be0cbc7403
-DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98bf1a0946ede03f8139dcc159c9a6cbbc019ef43c7b324990077df7ac7287866ea2daa813621ff3618ae1d77 SHA512 2b43e3e3fb2ccf6c29a889f10dfc0d5504dbca6fabaf10419f4e355e4b73d64cc1e632324e447b25ac24ee18bb88d8a9a23f9c4824b267343fb86e26e7d5c54b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.2.6.ebuild 1421 BLAKE2B efaae0cc26ad8542351721bd8a82e33241175170b5883b40f2bfb8cf8b6b55209b7e526087ec4104f5eb3a27328844c0f59aa70379ef3d950945259147f8bf86 SHA512 116498494644dfe64dc2764d33e4ee567b7e67ea8fc538ce17eec31243a739d2f5c7ad046952be7b01119fbf1635a44807284694e35ea0ffa56c2520c59646c0
-EBUILD mosh-1.3.0.ebuild 1425 BLAKE2B 8244b7496ab7091af92ff8ddf6d0f702c5d75ae9a647baddaf514fa67fe3532fb3c645cae287dde5da6d226e9d64a005427d656c5121dc7ad53524a552547662 SHA512 aa1d9546fc5a8ac7b58951e54e343a567b1afa63ccccc740e431b716c9ba58bac6ad5e27b4c07b89618ae56ade77d73a7da9d29b99d43b63179683913ce074ab
-EBUILD mosh-1.3.2.ebuild 1521 BLAKE2B 5c705dd5a60e2bc0a20d05ce9e144bd10b4dac450a447edd5b405497ce99ef3c9db0036399d10ae5461c537f5a3443305702804ba1a70557dc298144a38454ab SHA512 b396876e91803b785adc4e930b74b335e58266fa616b6a6b82eeeea6ff2e78703c96081ce7b97b55fbbbb5a98ad81b018e33ed1b1c34a427a33e0423c0771401
+EBUILD mosh-1.3.2.ebuild 1520 BLAKE2B 1f8046fbe505d2aae17c26db0a07145e64e9fdcc2e1629b60e7cf6254b24ff8ca94fbe0a3e457913a3f5e1ff5243f69ead99b32544eac5432dfeb439990ad408 SHA512 1b4d06097a904068c0718042d5eee38b95796d7b5f7cdee872fcb8292985338cda321978ae379ff840fecd4f5b378c3a2bc854089e8ee78ccd9c40ea64d3ba9a
 EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
 MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/mosh-1.2.6.ebuild b/net-misc/mosh/mosh-1.2.6.ebuild
deleted file mode 100644
index f51c7d11081c..000000000000
--- a/net-misc/mosh/mosh-1.2.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 eutils vcs-snapshot
-
-DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-HOMEPAGE="https://mosh.org"
-SRC_URI="https://mosh.org/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
-
-REQUIRED_USE="
-	|| ( client server )
-	examples? ( client )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	sys-libs/ncurses:0=
-	virtual/ssh
-	client? (
-		dev-lang/perl
-		dev-perl/IO-Tty
-	)
-	utempter? (
-		sys-libs/libutempter
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# [0] - avoid sandbox-violation calling git describe in Makefile
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
-)
-
-src_prepare() {
-	MAKEOPTS+=" V=1"
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-completion \
-		$(use_enable client) \
-		$(use_enable server) \
-		$(use_enable examples) \
-		$(use_enable ufw) \
-		$(use_enable mosh-hardening hardening) \
-		$(use_with utempter)
-}
-
-src_install() {
-	default
-
-	for myprog in $(find src/examples -type f -perm /0111) ; do
-		newbin ${myprog} ${PN}-$(basename ${myprog})
-		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
-	done
-
-	# bug 477384
-	dobashcomp conf/bash-completion/completions/mosh
-}
diff --git a/net-misc/mosh/mosh-1.3.0.ebuild b/net-misc/mosh/mosh-1.3.0.ebuild
deleted file mode 100644
index 61fd42fd6e5f..000000000000
--- a/net-misc/mosh/mosh-1.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1 eutils vcs-snapshot
-
-DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-HOMEPAGE="https://mosh.org"
-SRC_URI="https://mosh.org/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
-
-REQUIRED_USE="
-	|| ( client server )
-	examples? ( client )"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	sys-libs/ncurses:0=
-	virtual/ssh
-	client? (
-		dev-lang/perl
-		dev-perl/IO-Tty
-	)
-	utempter? (
-		sys-libs/libutempter
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# [0] - avoid sandbox-violation calling git describe in Makefile.
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
-)
-
-src_prepare() {
-	MAKEOPTS+=" V=1"
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-completion \
-		$(use_enable client) \
-		$(use_enable server) \
-		$(use_enable examples) \
-		$(use_enable ufw) \
-		$(use_enable mosh-hardening hardening) \
-		$(use_with utempter)
-}
-
-src_install() {
-	default
-
-	for myprog in $(find src/examples -type f -perm /0111) ; do
-		newbin ${myprog} ${PN}-$(basename ${myprog})
-		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
-	done
-
-	# bug 477384
-	dobashcomp conf/bash-completion/completions/mosh
-}
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index 950ba4172437..be9bd1d1b4b8 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index 3f0e6bf6d332..6bc07c07405b 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54
-EBUILD ndisc6-1.0.3.ebuild 743 BLAKE2B 35e638a9a2a40556bd7aa02d4543466f9d77e54d6d841d5e81a9cf66ce453a32e720784a939dc5a07b6c9a242c2907c38c06d8f1259c9fc7b04c95c20604c4b8 SHA512 526c6a9968b733292006f8d9c28d176d7f4dc7e154610a1d54d205c5c80991cb97c5ed474dc815e0aef8cfbb71315121ced92f68f76197e4a8641a3aab4ee4d8
+EBUILD ndisc6-1.0.3.ebuild 715 BLAKE2B d55a8d38fbaa67f4d90684394d91cdf50fa183ffa2920b3693fee0a63e4c324c3070d10d96a85b076a7ec35b643d747f1bb5d77c2afc1483608c43fde0d9ade3 SHA512 affa755999661260e8fb20d67bdfb552e51d8e88746c2fe01447784025f4c878fccb7a24232fb95194f5a167c846fd5619fba40895f9aab989c4f64028b15b24
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index 5302cb4d211d..8c33ffaefa15 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -21,10 +21,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd
+	newconfd "${FILESDIR}"/rdnssd.conf rdnssd
 	exeinto /etc/rdnssd
 	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
-	dodoc AUTHORS ChangeLog NEWS README || die
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 727744dc948c..b51857a2b257 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,8 +3,6 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 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.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
-EBUILD networkmanager-1.18.2.ebuild 11217 BLAKE2B d5190b2531fc5aa165091829e2c31ee0eea3b54c6aaa561aba45fe01e3f6eefe1b34ed5ad00bdc7d770138c2aa2637de0594b92585cd1724526882fec3cbc2eb SHA512 d0f729c1b70ec7da5fc648951fda0a790a3bc2a6105c0dc88f2d25c68f5e4fd833e809197a6c6008a3d6e74bfa6742c66e305d4328421315deb59201a95bd9e6
-EBUILD networkmanager-1.18.4-r1.ebuild 11300 BLAKE2B 1fcce945d90dc1cf95f27b8263b4f479bd9f2b78f6a542ef7fd0b4c6cb803fe48ec2e25ce7b1735eee69e3ae3c612bdd87acba58acec5f716f192b2301c6fcca SHA512 69415e44ac4fc19b276d1e07755c11e10d373f15ad718dd9ec7fe81e6ab3f3e4c05f3e75295f2e41e2581bf5b21bc7886ec159e375be1bea84f3ba67aa33c39a
+EBUILD networkmanager-1.18.4-r1.ebuild 11321 BLAKE2B 1f13dd1f8cbd83d3f04ded939edce5b12d150ee2f0265d246ff57a7d53c79e9dcbcf26e159984b7d798753a89bbcb795558083ae6575ae4c3f2625b5cdbc2167 SHA512 e0ff2b9682410bf64fad434f3cea3b1f7890b120e0e5ac4ca602c7240e2f7a31fef3ba9c198a5c3ab578af8dc982289196b0450889cc312afa17557f707a0007
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
deleted file mode 100644
index 2c4f15a72ad4..000000000000
--- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2019 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} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-COMMON_DEPEND="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_with resolvconf)
-		$(multilib_native_use_with selinux)
-		$(multilib_native_use_with systemd systemd-journal)
-		$(multilib_native_use_enable teamd teamdctl)
-		$(multilib_native_use_enable test tests)
-		$(multilib_native_use_enable vala)
-		--without-valgrind
-		$(multilib_native_use_with wifi iwd)
-		$(multilib_native_use_with wext)
-		$(multilib_native_use_enable wifi)
-	)
-
-	if multilib_is_native_abi && use policykit; then
-		myconf+=( --enable-polkit=yes )
-	else
-		myconf+=( --enable-polkit=disabled )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	# unit files directory needs to be passed only when systemd is enabled,
-	# otherwise systemd support is not disabled completely, bug #524534
-	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
-	if multilib_is_native_abi; then
-		# work-around man out-of-source brokenness, must be done before configure
-		ln -s "${S}/docs" docs || die
-		ln -s "${S}/man" man || die
-	fi
-
-	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
index 349e1bbb84c9..25d4a61e581c 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
 
 IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	bluetooth? ( modemmanager )
@@ -26,7 +27,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 1f687584d7e4..71c6313b1458 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,8 @@
+AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
 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
 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
-EBUILD nextcloud-client-2.6.0.ebuild 2025 BLAKE2B eac2c678f5ec56df913561427cd809d7bf78b29b98c93bd7a07ee507a937d86932d7b79fefa1b830fb444bed242f3a0f25db617a647c2b9cf8c182a8adde6919 SHA512 993568c7066c2e3ae06fff1440c2d183fc383ce42e2b8ea7682a2678437ec4fbcc29ea16fec6a43ec9069df0081b192bef46f7e25093633e517b3eb0851c8065
-EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B eac2c678f5ec56df913561427cd809d7bf78b29b98c93bd7a07ee507a937d86932d7b79fefa1b830fb444bed242f3a0f25db617a647c2b9cf8c182a8adde6919 SHA512 993568c7066c2e3ae06fff1440c2d183fc383ce42e2b8ea7682a2678437ec4fbcc29ea16fec6a43ec9069df0081b192bef46f7e25093633e517b3eb0851c8065
+EBUILD nextcloud-client-2.6.0.ebuild 1973 BLAKE2B ebe8613b3bae1c5f073404b358e70bc69552eeae1640c06f885af276d36a59b3cfbc182176672dd475e6bd927be12267029be04d791bd137e3bb483f3d2bdb02 SHA512 c10355ffa0c739f8db536b61fa22083af25c3499650ec6a60b42bc5410ec4d85bc1c12c224b8b443a2cc2b17174107fe5b8fb38d508a452f96fd0fd4622e81d3
+EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B 99b22e5e6ef99827c0846c2a1eaecae496376837d72c216358c530a8c03d3a8bdd607d26753d7c978018d01b285092a42bb77f1681f3fe31715d8acf92916f8b SHA512 d682fdc9c325c314b709d7de19499b3dda98bf3e75f519750e6269018b68e15c81fb7e26959effb9559a9d8a2530c386348cf03f97a58c77e159b816da23a751
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch
new file mode 100644
index 000000000000..da8423022b7a
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch
@@ -0,0 +1,22 @@
+From f9c6449c050cad673cf37971d9815a35e6ffb5dd Mon Sep 17 00:00:00 2001
+From: tuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com>
+Date: Fri, 12 Oct 2018 15:56:26 +0200
+Subject: [PATCH] Fix include file
+
+---
+ test/testnextcloudpropagator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
+index 6ad1a6b37..dc2e476ad 100644
+--- a/test/testnextcloudpropagator.cpp
++++ b/test/testnextcloudpropagator.cpp
+@@ -8,7 +8,7 @@
+ #include <QDebug>
+ 
+ #include "propagatedownload.h"
+-#include "nextcloudpropagator_p.h"
++#include "owncloudpropagator_p.h"
+ 
+ using namespace OCC;
+ namespace OCC {
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
index 6a82390c3c07..9b0d12160a76 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -79,13 +79,9 @@ 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
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
 }
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
index 6a82390c3c07..ba40a56dc34c 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}"/${P}-include_tests.patch )
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
@@ -79,13 +81,9 @@ 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
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
 }
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index fbf9f3862a0a..7c821bd13a0e 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,5 +1,5 @@
 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 829 BLAKE2B faa6abce18a23ee3d6c36ab7298a7f3b166503fc074ef4f21e34952cfd43e7dfa4b335a8e79899b0f007bd67597b18f1ee88afb84a19cd707dd8d4a9ce6ebf7e SHA512 c21047913ca423b15dbde991e4fc1984c6855047a94ea44b3a5075c827121cd40fded836ece3bf1143034186640759ef0d68a753d33f5ef09ff10d822ec4f450
+EBUILD ntpclient-2018.244-r1.ebuild 824 BLAKE2B e4bbd69500500a9b91171159074a042cdb1da5a6b4cf5758de851237f9f98635ba7076fd983ee2a4f25aea013679904a683bb0b22efc67ee0c01b8410ad08da8 SHA512 7dcba14407c1f4136df05d611ccd4b1dfe3e337a449ef8801c9b11d99f15cab614a613167936cd901a0ad13c73850bd774d3d8fe5b6bbde661c6e8c02392d068
 EBUILD ntpclient-2018.244.ebuild 772 BLAKE2B 8e0972d3e6c71a5f9378c842eb5021b8c769922e2a4774157741fff1db1efcb7347fa7bab932ab8289e3ac045de95b0ddde7b8e0f5cce3b848716de8f510ec09 SHA512 586bd3a631505608342bb6e10094d178433c7dc35e1fe7876c641dd7544817449aa3e2b0a5565efd6bda5807e85aebe86b296a6c2899cc775c9ce1dad23bba76
-MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
+MISC metadata.xml 1131 BLAKE2B ec8fd204149e107cdd9f29528be26e12f7e9f7a9bbcf6c9fc0be38ff6664f28a34285353955ef4cea63e169b025db793af437b774d2697d6b7ab1b77bfb1dbee SHA512 ba48bf738e4fd1288385d04a24d89bacae3c14dd292b29305320ebda63a94effa0e3ec5c01cf98623a76a0d98944e2056d300d2ad45770ed787eb66ab16a4345
diff --git a/net-misc/ntpclient/metadata.xml b/net-misc/ntpclient/metadata.xml
index 5d4f58a27a06..3582e10f27d3 100644
--- a/net-misc/ntpclient/metadata.xml
+++ b/net-misc/ntpclient/metadata.xml
@@ -5,21 +5,17 @@
 		<email>monsieurp@gentoo.org</email>
 	</maintainer>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		NTPClient is an NTP client for UNIX-like systems, RFC 1305 and RFC 4330.
 		Its functionality is a small subset of ntpd, chrony, OpenNTPd, and xntpd.
 		Since it is much smaller, it is also more relevant for embedded systems in need of only a client.
 	</longdescription>
 	<upstream>
-		<bugs-to>https://github.com/troglobit/ntpclient/issues</bugs-to>
-		<remote-id type="github">troglobit/ntpclient</remote-id>
+		<bugs-to>https://github.com/troglobit/sntpd/issues</bugs-to>
+		<remote-id type="github">troglobit/sntpd</remote-id>
 	</upstream>
 	<use>
 		<flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag>
diff --git a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
index a76559041406..d3cb200c52c5 100644
--- a/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
+++ b/net-misc/ntpclient/ntpclient-2018.244-r1.ebuild
@@ -7,12 +7,12 @@ 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"
+HOMEPAGE="https://github.com/troglobit/sntpd"
+SRC_URI="https://github.com/troglobit/sntpd/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"
+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/nyx/Manifest b/net-misc/nyx/Manifest
index 52d14db0deae..6991686aa30a 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 624 BLAKE2B 3ae222bfd6354d99a911335cbe1949c1bc469376b1373f399c3b961ef8279b56d2febee594d4f535ca68d0a4b694621c92b518b77a39c6dea2d0448005149045 SHA512 cd101d4444675b7676f2b077c0c2afef7fb7bb42ba1a932feac5519624e2ef74c0d51031bd8f83b113dafdd5d0a615295fee6fb3eb2e58f95ef789503d8d0f10
-EBUILD nyx-2.1.0.ebuild 624 BLAKE2B 3ae222bfd6354d99a911335cbe1949c1bc469376b1373f399c3b961ef8279b56d2febee594d4f535ca68d0a4b694621c92b518b77a39c6dea2d0448005149045 SHA512 cd101d4444675b7676f2b077c0c2afef7fb7bb42ba1a932feac5519624e2ef74c0d51031bd8f83b113dafdd5d0a615295fee6fb3eb2e58f95ef789503d8d0f10
+EBUILD nyx-2.0.4.ebuild 651 BLAKE2B ff5122d0ba4b9b4677a6cdefc441be2fd51ac79b87f006cd5eefbe7c5f00600232e569f76e667fcdee8f7b5496c9780858d7cc7c5c8956ae7c2a59627f92bd00 SHA512 d95d826a03b1478f9679d512210fc7bb9b8adad6c7d37cdcabb1c2db0910407e4e7757d1ddbf651afb607df3c4976391f65fbcd484df2129e53008a54e009fbb
+EBUILD nyx-2.1.0.ebuild 651 BLAKE2B ff5122d0ba4b9b4677a6cdefc441be2fd51ac79b87f006cd5eefbe7c5f00600232e569f76e667fcdee8f7b5496c9780858d7cc7c5c8956ae7c2a59627f92bd00 SHA512 d95d826a03b1478f9679d512210fc7bb9b8adad6c7d37cdcabb1c2db0910407e4e7757d1ddbf651afb607df3c4976391f65fbcd484df2129e53008a54e009fbb
 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 47a846523c3b..768da7eff156 100644
--- a/net-misc/nyx/nyx-2.0.4.ebuild
+++ b/net-misc/nyx/nyx-2.0.4.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0.ebuild
index 47a846523c3b..768da7eff156 100644
--- a/net-misc/nyx/nyx-2.1.0.ebuild
+++ b/net-misc/nyx/nyx-2.1.0.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 5cd7bab34cd2..d54028e13f8a 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -12,7 +12,7 @@ AUX oidentd.socket 142 BLAKE2B d085224442446c55f6850f15537ab9c4f51a4093e12de58a8
 AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c80d481795b46b67ce779682480084a02234c2a9f6b4b052eaed7a6ab8d9e31df34e4b1c81e5201e7a4c SHA512 513e49d74c25ea0392a4b9541df0b275fa497bf2cb1d55a3c1c31a9cfe207ec2de69e76d7813531c90b5b378d1dd55b3ee21371ad281ff5f2a89ab70f59a25b4
 AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
-DIST oidentd-2.3.2.tar.xz 187772 BLAKE2B 460d2959cf9f1f125a76191f8b67a083a7d9bce84c706c76f6e8da6113b12eb6e760345774d15079ff449c153ac54805d4bfa8b057c1238ff703474e118b8458 SHA512 7293339897149a990928105e6cdd77aef7cd273f625496fcc674a414764ebfe835d2a9525e518a7215fc93537c48b70d15999d5669227dbb7fbf5cefb3d04e14
-EBUILD oidentd-2.0.8-r6.ebuild 1442 BLAKE2B 4f401ae09e7cec5b0c72f865603f86c03bb1f7ed122946f74290cce4d4ac681d9a05e0e1b9e0759e179d0156fb6def0332fb0a8912ab54b3e3cd5193825c95bd SHA512 e4c830cb99d8c3cf366832f63412732434dad1e6728e2081bbd1a7bc7363fc71b1966af8a9ce8f18e95201ffcd05a927fc7a5fee67b5700b42383c1613e88e61
-EBUILD oidentd-2.3.2.ebuild 1243 BLAKE2B c1b922a6e7808203f629631560046bbfc68aee794aeeb9ab3082d1536d0f1f370a04a924ce0103b6b8fc9e2e23807cb47adfc9196749b3741724ba3a96c1ec8d SHA512 dbb12ae0f7c54fb1fa5440dfd3868e7fe43e0114cc7346284c5c53954c5b9db8b78d8f494b16bb1e029cfbf25bacb1a87ab227e8447c315bf93b58515fef3d2d
+DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0
+EBUILD oidentd-2.0.8-r6.ebuild 1441 BLAKE2B c7d19f0c37383cdbbccb764464006f5cef561865e356679e91bf318817d731db45539313c8984352294adccc849007cf974195242cbeb81c2bee3d47854a39ea SHA512 ac4b51d52fd6bb3719f3a94dabf93c12ebede6b388db88a33e7ece8e1383543a376c8e7b66b6047ba6d220d6839be34ba30db51f85abf12b4227855411742672
+EBUILD oidentd-2.4.0.ebuild 1190 BLAKE2B 81c3af9c1d4adc68f61d1c2000cba415d3111f6688c08ab539d0e0bb0b5cab49fe44ae57e9248762bf57c68552fad0ee2a73cecaaef476f54b5c8733ba8271df SHA512 c912deeb8409409d176186ddb52c3d12b994de512a76b8a8e5fa3eb11188f92ce08aa87f228ab1fef19b9f8bd37ca4cdceecc7e9ade2b737d09aad1eec258168
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index 329da09121d8..54be56652600 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit linux-info systemd
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
-HOMEPAGE="http://ojnk.sourceforge.net/"
+HOMEPAGE="https://oidentd.janikrabe.com/"
 SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/oidentd/oidentd-2.3.2.ebuild b/net-misc/oidentd/oidentd-2.4.0.ebuild
index 3c995fd53776..0e6c8b86cf54 100644
--- a/net-misc/oidentd/oidentd-2.3.2.ebuild
+++ b/net-misc/oidentd/oidentd-2.4.0.ebuild
@@ -3,28 +3,24 @@
 
 EAPI=7
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="https://oidentd.janikrabe.com/"
 SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="debug ipv6 masquerade selinux"
 
-DEPEND="masquerade? (
-		net-libs/libnetfilter_conntrack
-		sys-libs/libcap-ng )"
+DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
 
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-oident )"
-
-pkg_setup() {
-	enewgroup oidentd
-	enewuser oidentd -1 -1 -1 oidentd
-}
+RDEPEND="
+	acct-user/oidentd
+	acct-group/oidentd
+	selinux? ( sec-policy/selinux-oident )
+	${DEPEND}"
 
 src_prepare() {
 	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
@@ -37,8 +33,8 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable ipv6)
 		$(use_enable masquerade libnfct)
-		$(use_enable masquerade masq)
 		$(use_enable masquerade nat)
+		--enable-xdgbdir
 	)
 	econf "${myconf[@]}"
 }
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 67fabe3bfa01..7c3028571f2f 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -4,5 +4,6 @@ AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237
 DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 EBUILD openntpd-6.0_p1.ebuild 2966 BLAKE2B c24c4e04cf3967dae935ce007d866162b0608315364aac759458dc3210ed81679c79b20e624760c730a8385be8a69f7475584aa31a5e05696d81b56a4a8e307a SHA512 f95ad667622c167c4d9eec45705e41ac3f30c5e35eef8fec18c729c535460f478f44bf91ee7f7892caea35427e576d4e46a6c010e88e62b9e05499a265d4ad4f
+EBUILD openntpd-6.2_p3-r1.ebuild 1828 BLAKE2B 7813a2d7d4812115e70298d31672496804a96a3209174cc1008489402e7af8d6ad2352d2e7ba7cbdd0ef45d1c5811134e1503dd50e95bca672a4fa5954c5cc0e SHA512 89b35ea882953ca5ac63859ab30c8daebe48349aacd1bbd486be67ebb2bcccbd8e7f8c468f0def8f46a5b42f38d1d49bd3f6676688bbcf86afa9a610eb62cbfe
 EBUILD openntpd-6.2_p3.ebuild 3142 BLAKE2B fd27664a830055da657731df5b3e36d6643d7b8d31d2b2c89885597bb26b7055dd00c57d1f3a629bfe1a57475fe913774c44c8d492f513779b104ab9be01b9ce SHA512 d1d25b88d27a4e7a59cf71929fc3a8245ef46ee28f5d2ac87281c9979406c64b4c2522ecb03333fdca0055a0d5a0c4e9db84e2329c4ac93c12cd7104abd16980
 MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
new file mode 100644
index 000000000000..db3edb458e54
--- /dev/null
+++ b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_P="${P/_p/p}"
+
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl selinux"
+
+DEPEND="
+	!net-misc/ntp[-openntpd]
+	libressl? ( dev-libs/libressl:0= )"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/openntpd
+	acct-user/openntpd
+	selinux? ( sec-policy/selinux-ntp )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
+
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
+
+	# fix default config to use gentoo pool
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+
+	# disable constraint config if libressl not enabled
+	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
+}
+
+src_configure() {
+	econf \
+		--with-privsep-user=openntpd \
+		--with-privsep-path=/var/lib/openntpd/chroot \
+		$(use_enable libressl https-constraint)
+}
+
+src_install() {
+	default
+
+	rm -r "${ED}"/var || die
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
diff --git a/net-misc/openssh-blacklist/Manifest b/net-misc/openssh-blacklist/Manifest
deleted file mode 100644
index ac2022319923..000000000000
--- a/net-misc/openssh-blacklist/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX blacklist-encode.c 6532 BLAKE2B 3b49bc78e0be47af89a0c91b4630bb59cb5dc90a95e5ea48a9f794cc8659e4d589d1d6938f516b4f46efd6118e247cd5b5bd960adde09dc608adb15c3eb34a22 SHA512 e2f4bf86c5524244542674c7d670f49c51cfa0db8e2eeba9534a53074bd31d8e71a94def56631421bd0439a43f153e1314b3bd3d8d37ee0a2228d8dc747d4dac
-DIST openssh-blacklist_0.4.1.tar.gz 7519666 BLAKE2B 8b175e115ee4fc0089b391c1bfcbb2fed4cbd17aebb234a94ed4b652e82d3cc685727938ec63cb7fb1b5352efee729101393c4236ac142bb7061049d62287bb8 SHA512 1633319757470fe15a9b5f98d301db9850485eaeef894711596ec929e22655301e9b454c02db4a7c7515d64063e6f122c6ede392343eb8227a98ce68bbceb0b8
-EBUILD openssh-blacklist-0.4.1.ebuild 928 BLAKE2B 9926d172c02f17c260a84c9452ba8c15e4d8852b1074ec0d16add67160251f30ca81739df70765acd39fe267f3255e859aa03d94d0c874da41af63764135d555 SHA512 39389ad58a948722e7c6ae97f061bea60750da23870a34e75b8bf9c39207d390b2d659fcf2f2056b0bf7d659238a88b748832b63f45ed0a687b737078d8aa152
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/openssh-blacklist/files/blacklist-encode.c b/net-misc/openssh-blacklist/files/blacklist-encode.c
deleted file mode 100644
index 717c3e6575ff..000000000000
--- a/net-misc/openssh-blacklist/files/blacklist-encode.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * The blacklist encoder for RSA/DSA key blacklisting based on partial
- * fingerprints,
- * developed under Openwall Project for Owl - http://www.openwall.com/Owl/
- *
- * Copyright (c) 2008 Dmitry V. Levin <ldv at cvs.openwall.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * The blacklist encoding was designed by Solar Designer and Dmitry V. Levin.
- * No intellectual property rights to the encoding scheme are claimed.
- *
- * This effort was supported by CivicActions - http://www.civicactions.com
- *
- * The file size to encode 294,903 of 48-bit fingerprints is just 1.3 MB,
- * which corresponds to less than 4.5 bytes per fingerprint.
- */
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <errno.h>
-#include <error.h>
-#include <limits.h>
-
-static void *
-xmalloc(size_t size)
-{
-	void   *r = malloc(size);
-
-	if (!r)
-		error(EXIT_FAILURE, errno, "malloc: allocating %lu bytes",
-		      (unsigned long) size);
-	return r;
-}
-
-static void *
-xcalloc(size_t nmemb, size_t size)
-{
-	void   *r = calloc(nmemb, size);
-
-	if (!r)
-		error(EXIT_FAILURE, errno, "calloc: allocating %lu*%lu bytes",
-		      (unsigned long) nmemb, (unsigned long) size);
-	return r;
-}
-
-static void *
-xrealloc(void *ptr, size_t nmemb, size_t elem_size)
-{
-	if (nmemb && ULONG_MAX / nmemb < elem_size)
-		error(EXIT_FAILURE, 0, "realloc: nmemb*size > ULONG_MAX");
-
-	size_t  size = nmemb * elem_size;
-	void   *r = realloc(ptr, size);
-
-	if (!r)
-		error(EXIT_FAILURE, errno,
-		      "realloc: allocating %lu*%lu bytes",
-		      (unsigned long) nmemb, (unsigned long) elem_size);
-	return r;
-}
-
-static char *
-xstrdup(const char *s)
-{
-	size_t  len = strlen(s);
-	char   *r = xmalloc(len + 1);
-
-	memcpy(r, s, len + 1);
-	return r;
-}
-
-static unsigned
-c2u(uint8_t c)
-{
-	return (c >= 'a') ? (c - 'a' + 10) : (c - '0');
-}
-
-static char **records = NULL;
-static unsigned records_count = 0;
-
-static int
-comparator(const void *p1, const void *p2)
-{
-	return strcmp(*(char *const *) p1, *(char *const *) p2);
-}
-
-static void
-read_stream(FILE *fp, unsigned bytes)
-{
-	char   *line = NULL;
-	unsigned size = 0, allocated = 0, len = bytes * 2;
-	int     n;
-
-	while ((n = getline(&line, &size, fp)) >= 0)
-	{
-		if (n > 0 && line[n - 1] == '\n')
-			line[--n] = '\0';
-		if (n < len || strspn(line, "0123456789abcdef") < n)
-			continue;	/* ignore short or invalid lines */
-		line[len] = '\0';
-
-		if (!records)
-			records = xcalloc(allocated = 1024, sizeof(*records));
-		if (records_count >= allocated)
-			records = xrealloc(records, allocated *= 2,
-					   sizeof(*records));
-		records[records_count++] = xstrdup(line);
-	}
-	free(line);
-	records = xrealloc(records, records_count, sizeof(*records));
-	if (records_count >= (1U << 24))
-		error(EXIT_FAILURE, 0, "too many records: %u", records_count);
-
-	qsort(records, records_count, sizeof(*records), comparator);
-}
-
-static void
-print_uint8(FILE *fp, uint8_t v)
-{
-	fprintf(fp, "%c", v);
-}
-
-static void
-print_uint16(FILE *fp, uint16_t v)
-{
-	fprintf(fp, "%c%c", v >> 8, v & 0xff);
-}
-
-static void
-print_uint24(FILE *fp, uint32_t v)
-{
-	fprintf(fp, "%c%c%c", (v >> 16) & 0xff, (v >> 8) & 0xff, v & 0xff);
-}
-
-int
-main(int ac, const char **av)
-{
-	unsigned count, i, record_bytes, first_index = 0, prev_index = 0;
-	int     min_offset, max_offset;
-	int    *offsets;
-
-	if (ac < 2)
-		error(EXIT_FAILURE, 0, "insufficient arguments");
-	if (ac > 2)
-		error(EXIT_FAILURE, 0, "too many arguments");
-	record_bytes = atoi(av[1]);
-	if (record_bytes < 6 || record_bytes > 16)
-		error(EXIT_FAILURE, 0, "fingerprint size out of bounds");
-
-	read_stream(stdin, record_bytes);
-
-	/* initialize global records offset table */
-	offsets = xcalloc(65536, sizeof(*offsets));
-	for (count = 0; count < records_count; ++count, prev_index = i)
-	{
-		const char *r = records[count];
-
-		i = (((((c2u(r[0]) << 4) + c2u(r[1])) << 4) +
-		      c2u(r[2])) << 4) + c2u(r[3]);
-		if (count == 0)
-			first_index = i;
-		else if (i == prev_index)
-			continue;
-		offsets[i] = count;
-	}
-
-	/* set offsets for indices without records */
-	if (offsets[65536 - 1] == 0)
-		offsets[65536 - 1] = records_count;
-	for (i = 65536 - 2; i > first_index; --i)
-		if (offsets[i] == 0)
-			offsets[i] = offsets[i + 1];
-
-	/* make global records offset table relative to
-	   expected position assuming uniform distribution. */
-	for (i = 0, min_offset = 0, max_offset = 0; i < 65536; ++i)
-	{
-		offsets[i] -= (i * (unsigned long long) records_count) >> 16;
-		if (offsets[i] < min_offset)
-			min_offset = offsets[i];
-		if (offsets[i] > max_offset)
-			max_offset = offsets[i];
-	}
-	min_offset = -min_offset;
-	if (min_offset < 0)
-		error(EXIT_FAILURE, 0,
-		      "invalid offset shift: %d", min_offset);
-	for (i = 0; i < 65536; ++i)
-	{
-		offsets[i] += min_offset;
-		if (offsets[i] < 0 || offsets[i] >= 65536)
-			error(EXIT_FAILURE, 0,
-			      "offset overflow for index %#x: %d",
-			      i, offsets[i]);
-	}
-	max_offset += min_offset;
-
-	/* Header, 16 bytes */
-
-	/* format version identifier */
-	printf("SSH-FP00");
-	/* index size, in bits */
-	print_uint8(stdout, 16);
-	/* offset size, in bits */
-	print_uint8(stdout, 16);
-	/* record size, in bits */
-	print_uint8(stdout, record_bytes * 8);
-	/* records count */
-	print_uint24(stdout, records_count);
-	/* offset shift */
-	print_uint16(stdout, min_offset);
-	fprintf(stderr, "records=%u, offset shift=%d, max offset=%d\n",
-		records_count, min_offset, max_offset);
-
-	/* Index, 65536 * 2 bytes */
-	for (i = 0; i < 65536; ++i)
-		print_uint16(stdout, offsets[i]);
-
-	/* Fingerprints, records_count * (record_bytes-2) bytes */
-	for (count = 0; count < records_count; ++count)
-	{
-		const char *r = records[count] + 4;
-
-		for (i = 0; i < record_bytes - 2; ++i)
-			print_uint8(stdout,
-				    c2u(r[i * 2]) * 16 + c2u(r[i * 2 + 1]));
-	}
-
-	if (fclose(stdout))
-		error(EXIT_FAILURE, errno, "stdout");
-	return 0;
-}
diff --git a/net-misc/openssh-blacklist/metadata.xml b/net-misc/openssh-blacklist/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/net-misc/openssh-blacklist/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 type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild b/net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild
deleted file mode 100644
index 679e738b9631..000000000000
--- a/net-misc/openssh-blacklist/openssh-blacklist-0.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Source files of vuln Debian keys"
-HOMEPAGE="https://packages.qa.debian.org/o/openssh-blacklist.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND=""
-
-maint_pkg_create() {
-	wget http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/openssh/blacklist-encode.c -O "${FILESDIR}"/blacklist-encode.c
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/blacklist-encode.c . || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getBUILD_CC)" \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CPPFLAGS="${BUILD_CPPFLAGS}" \
-		LDFLAGS="${BUILD_LDFLAGS}" \
-		blacklist-encode || die
-	cat [DR]SA-* | ./blacklist-encode 6 > blacklist
-}
-
-src_install() {
-	insinto /etc/ssh
-	doins blacklist || die
-}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 0ea69ec3269c..240d82c54116 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -64,7 +64,7 @@ DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab4
 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566
 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
-EBUILD openssh-7.5_p1-r4.ebuild 11137 BLAKE2B 371ae94d3f12874e8ee17416cd2c1b81059b4db2cef6cad7453aa85c2c192ebac644c3907d85d42df7729044a8cebb90ef19e35036a402be404a0841333eb653 SHA512 6655b250cbec41c4432b79a4699b15d73f246820d5f0f3c9fdfe5053388be3b0be7a26ec800055ad0824c92cb91bb1a5c9a939d15ff58af07164b9fce230a415
+EBUILD openssh-7.5_p1-r4.ebuild 11164 BLAKE2B d22a97f92b786ef366c84a631d7c7d99472e0897dabd42ca5125b011b2039baacecabb86747a78c4ce80cea5e19403ba94167ff08104990cf70b2625ffa1ea41 SHA512 274ebe0cf4d6e3b73ad4f62852d862bebff271175086857dacad252093924a7400b969f35fccc4d07ac90de6597e19a112f79f7216371be70bf5f76021109af8
 EBUILD openssh-7.7_p1-r9.ebuild 15919 BLAKE2B be6c6ac296d5332805d9a90c72a23598d17ca02212f2309bbb9dbff5c0374a6ef1c7d346fdd365afc0b0b853c5744c98f2db0d66347313a173aad4942abefc23 SHA512 36357ad30be27388decd08db6ae580984363b4c98c53cb634e5164b2924887cac4d19ea941f686b2290f8ff93db8c4f506fb2f76b24a1790364677ef851f6ce3
 EBUILD openssh-7.9_p1-r4.ebuild 16293 BLAKE2B 1f96b90873bed0b45da2ba26c3b1b9fb170598e6f6bc3090b8edfc7274185291f7e351a0e945e1a04ccb4e2c8fde18ba50f7bf7cd145a98721092a7608991875 SHA512 ee4fc5f36febc96c188d30d2d46b6d14c3d80178c2801802160ffbbce2d019ba6e26f26ae41e752748dc6999e676a4b2dae9e27ab7a42500c3c386f578bc24e7
 EBUILD openssh-8.0_p1-r4.ebuild 16661 BLAKE2B 7b58c80723df0c0c8c7b2a0724b6cb7549211cd618b54bba53e769af0f29c4c887e454a29e06a9e95b30ccc23156e9cfbfc63801df3a224126c296ac43d1f277 SHA512 3d5fe15f2ae2dda9c9b42d153a4fb9efcd553a79b0c136c51f8ee5770679334580ecc062aba8c01119fe4795669b76284f1a051d58797284e0de1c0e1f296c7e
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index 4b4ae5463ae3..cebd6ad71ed6 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -28,6 +28,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="ldns? ( ssl )
 	pie? ( !static )
 	ssh1? ( ssl )
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 7699dd49ede6..469552be8856 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -15,4 +15,4 @@ DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d
 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
-MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
+MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index cd4755d9fd44..78767da1a3bc 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index 8a8aec21b15e..6617103b255b 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -3,5 +3,5 @@ AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703
 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a
 DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95
 EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558
-EBUILD proxychains-4.14.ebuild 1038 BLAKE2B 159f93afdf7b3c839bd1b23f74387c812b087b327ef85da98ce844bc499e45aaace2968a867847d101d1814a14fc2eb5c9eb32ab5ca698a0242dbff9d77b3989 SHA512 a5e158942cb57d0cfa34b223e3552450f65d8dce6990ae9629fc7d781c0aefdc2ee293304b11d022c1af2a2cbd1dd4fef5bf061fff01c77a125fe75fc519c279
-MISC metadata.xml 253 BLAKE2B 3e4b9b170b225b9391c36cf88a21abdcae8482183a3455b61290468e87ff293831ce690981b2359b67454a6245503ea40150cbda72375033f4d25bf7f66337d7 SHA512 1193e3a626c519491a529009a6df3dd2fb76de6e6510e825f01ea9f5ad5f61b2b27a3bef5a1fae47aa1a922d02faef8b4a1691cee99665a5d6492c4c73effc17
+EBUILD proxychains-4.14.ebuild 1029 BLAKE2B b8bbe250a091c7334346edd2e2b44e33218aa4d474565ae632fbd85c49107deda8da65b0fbb41b14412531f557bc807c6550ab747f1d793d750fa6532ae88862 SHA512 c0f99cbeed4536aa58b40ebd31f5e9dfa48c0e097e822642529276d5006c7a8e7e8474a37c8b215b5e9ba4acee1ea93c4820d6627154afff83dbd5338c45ffae
+MISC metadata.xml 622 BLAKE2B 0437eff84f33578c5d27f011dddb6bacd7b645f2efcdcb612155eb30e2d49ac58b2fe5b38831eb973254c5e213b3eefed46fd9a9e3d89e8396483b9ee348b04b SHA512 8aae7373f8835661775fee0cb07a5a5fb16228e29d3f87434dc95b05f051f18c19e327595a79d447028c91edf8ae410e5a7c3c5f54a43d6283d5e32a16ee2b04
diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml
index 5046f26bf419..f22f38a52d8b 100644
--- a/net-misc/proxychains/metadata.xml
+++ b/net-misc/proxychains/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Program that hooks network-related libc functions
+		in DYNAMICALLY LINKED programs via a preloaded DLL (dlsym(), LD_PRELOAD)
+		and redirects the connections through SOCKS4a/5 or HTTP proxies.
+		It supports TCP only (no UDP/ICMP etc).
+	</longdescription>
 	<upstream>
 		<remote-id type="github">rofl0r/proxychains-ng</remote-id>
 	</upstream>
diff --git a/net-misc/proxychains/proxychains-4.14.ebuild b/net-misc/proxychains/proxychains-4.14.ebuild
index 9897fb23beb4..440fc2477149 100644
--- a/net-misc/proxychains/proxychains-4.14.ebuild
+++ b/net-misc/proxychains/proxychains-4.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 MY_PN=${PN}-ng
 MY_P=${MY_PN}-${PV}
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index c62ada3a21a0..b9b60c9684e7 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,6 +1,6 @@
 AUX proxytunnel-allowTLS.patch 592 BLAKE2B 2c48bb1a1c2e2374043d9bc73e653a5f87f5bbda6a64a5572cbe3bdafe533205f619b7248c8f7b6cecf7de8c72940a6ccf64e054c5419e9ba656f773e9d7d346 SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9
 DIST proxytunnel-1.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc
-EBUILD proxytunnel-1.9.1-r1.ebuild 1062 BLAKE2B 456dd113a2b48783723fdb5493e891db17654ae9a7fc4bdf5bb6254ae46d1c6f059df4c42a17f82fba569cd84496d3cc3a6f1f95b3353d379eccdfff25641187 SHA512 8bc963c149db9d497a969d6f24b3cedd64d0a9d099d94825cf85b89415e98d9b11defc545f424dd1366aa1c28f089692f2efd0f8bc3e488341d7b09bdddf1518
-EBUILD proxytunnel-1.9.1-r2.ebuild 1158 BLAKE2B 3f5a88d370e82f690cb1a109d963a7b9a1442c8b8f3516a92a2ebe274a9dbbb7f05d5748a074afbc35fa0d6c54f99a1937e02b7726a670a18e7c42c9a6ab077b SHA512 aa7bc374946215f40263f9f868b160d181b26e858db5d23d3909e8e0415dbffb50a484e827a3b1f0237122edc5c6017bc4dc92ebd0fa9e97139ea905c9a4503c
-EBUILD proxytunnel-9999.ebuild 1110 BLAKE2B bf3f8dac9a9c63691cf961f2ad29d335c872df7cef1680ac1acfe6119628214214d329cdbe981248bc77ad0ec826b1ca97eacdbb0f1859c04ef203f92f875977 SHA512 92b3595da31853468a24aa0d5468d2d26e2d03e5851c695b2d4445c50d06faa4c4ce0d21a54f70824c5ae5e539ba09b520e62da0633fba4f98c725e882a63870
+EBUILD proxytunnel-1.9.1-r1.ebuild 1048 BLAKE2B 3e094ffb84e324cb426afb819cdf6ab0be3ce187fa792079a7b19b6df96e70ea2004d19d28e87b70fccb2cfb7f34c16d63cbcad6bbb778f52bc9f75f98445d55 SHA512 795116f573c2692ce2776b7cb4ccd6e3c19a88650750bdd2f87d5b5e8bdcf65efb08ed75dbbb93046ad85d4d80fc6072b4c721d80bca81ce0d3493206b9837d0
+EBUILD proxytunnel-1.9.1-r2.ebuild 1144 BLAKE2B 235a78aecce1da4cb61be6cb8955994c4d20d1ba3c28855d88b0c53c1547d39c92e67a506f940a8bfe4ebf02f1b673c9f33c28b58cbc506455df636a79f8e450 SHA512 cc5dcbcdbef3b73219c3b95ebe173965398e537e9bfbe2bf8e20d7415888b8ac40fb69f6bcfaeec00d50a3a7b2b317e1be71ca199b374496a818a71a2d7b7c09
+EBUILD proxytunnel-9999.ebuild 1096 BLAKE2B 5bb10d54b3fb48b972d5e9907a4a8bb69a6c9619668c5b8e55e74db108020bd8eff1f3acf8e1bdfc58153952751a4071652a3168e0062f6ad253589cabf2da8d SHA512 265cac79e95bfaa8f639114a03b4f79f73f83450328259dd3ddfddf63b575a35536009bfd4ae39c1716b973644a8bd78aa28b3a229c74edb47bdc3ff10eaa215
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
index 40ac24ea6cf2..4807d1daeff2 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
@@ -28,10 +28,10 @@ src_prepare() {
 
 src_compile() {
 	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO
 }
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
index c3a2f9493841..eaf7123e2b0c 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
@@ -39,10 +39,10 @@ src_prepare() {
 
 src_compile() {
 	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
index 16a4a63d0bb9..2622cf670239 100644
--- a/net-misc/proxytunnel/proxytunnel-9999.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -36,10 +36,10 @@ src_prepare() {
 
 src_compile() {
 	use static && append-ldflags -static
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/net-misc/pyhoca-cli/Manifest b/net-misc/pyhoca-cli/Manifest
index 94cbffe5283e..424e2ec96b9b 100644
--- a/net-misc/pyhoca-cli/Manifest
+++ b/net-misc/pyhoca-cli/Manifest
@@ -1,7 +1,5 @@
-DIST pyhoca-cli-0.5.0.4.tar.gz 32486 BLAKE2B e47799519715c14ba89f8696ed8d394248397548ccbd0dcfc514d8c8ba96071dfa12a191eace4cc6f92aeaeb8fd0b17addf471e6f11d5ffb4e456977d38c7e14 SHA512 6dadbd01922f9957469c2f401a6b1d7da4ad7bfa9c82f38d951b230cd880b826e96a63cf3d244d27299ea9bab4d1f42239a2f0d73702e62eb4859a52c25158bd
-DIST pyhoca-cli-0.6.0.0.tar.gz 40513 BLAKE2B 203ba683c65a77c8f136ac65fea156e938b86b8338dff4c39c5b0ab9368a5e0b1e845e4862b9d95fd02cec9484691b9b11b6d2dbd41cc8a1089e32a4e9c9d717 SHA512 a6e2504cf40eb847db826eb016bcba4ead83f5b8d45de8c251c4c3b0f4cef86dbdfe4c8663f900ce9afe6fef868e67ff5ab1e3222179d19afcc7d0233b4804c6
 DIST pyhoca-cli-0.6.0.1.tar.gz 40816 BLAKE2B 719ca6f277cfd2ecd2100e1b34e1c0d4d7e6849eb0b8f39d2a1628878b4da1bdcc1db622144d815347c33e0148d7fd6303caa661f146e18422169d7ae455c993 SHA512 65ced3bcb6e8fc15d22b0abc760a981af66b10325278613a9276de16c1e73d3b8d325b57aed9d4faf43a6d9eb8167045716c2974d4f6563c7a51df8ee66a69eb
-EBUILD pyhoca-cli-0.5.0.4.ebuild 632 BLAKE2B 2fb2dc256b574eb5c0513aea1dca34e4da1bfab381e79c52c050671d58cb181012feae8fbbe551b8681102dedbad602b3f98fda72b9037bd270ac05a5fd86ce3 SHA512 f8f04b7e2eefe51364fe3288037eca80ba02fb5b254824d5504802d9b14e54324d3b88989a02354535b138a14cfeea3fe7bb7dde670f395f601d80cf1c0248c1
-EBUILD pyhoca-cli-0.6.0.0.ebuild 676 BLAKE2B c3c543015469c793dfd7c3d4679c2668b8cb951c2a6159e28ee7af9d69a4a0282ab56d772ab88ca7b78256910110c078839019c8206d446a0700f03f6f4bb689 SHA512 3f10663f7eb34e17dbf511f4976b95381a55df5d3ffc20e66e650e2a017bcf6dfe0bf1e3932405e33f9cf2188f0fd0fe4c6d357586f083821ff6f9a7c9cf2f3e
+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
 MISC metadata.xml 521 BLAKE2B 07e613991af22f75609d554e9c533773fb4ae1b00227c717dde027b16cc14c5a31c0144b8970dc8095e2eabd62d3bff0578b290489eb44787611b860120ed35d SHA512 7be8e7f29191fc70cfb2c9f3482dc536803ba374996c52fb8c7011c60c0f7de0b10ab333792ee59b391d04e8a74bd778a30db7a6722118e612db232567527959
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.4.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.4.ebuild
deleted file mode 100644
index 2a3ca05effb4..000000000000
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.5.0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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.5.0.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/man1/*
-}
diff --git a/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.0.ebuild b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
index 858a77c4648b..30c368003023 100644
--- a/net-misc/pyhoca-cli/pyhoca-cli-0.6.0.0.ebuild
+++ b/net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go command line client"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.6.0.1[${PYTHON_USEDEP}]"
+	>=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 python_install() {
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index 6519ac4064b6..d283365fc43d 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,5 +1,5 @@
-DIST pyhoca-gui-0.5.0.7.tar.gz 1345182 BLAKE2B 4986c1d19663ed3df29992cb7b442bed4fc95bdd6e0f1d3521e1bc3d2ab0d98aa9578a470995ab0b28ba13fb29fdb8c384a59f09d08270dd1d689177a9548045 SHA512 bfb0eb95a87e19ff84fd13c642725be40369ec8e7f58615301033d22e3c1f81ed8b47542989711b1ee9414382989c8e258fa24f3f3c6cb950c42a53a9a6bd8b6
 DIST pyhoca-gui-0.5.0.8.tar.gz 2064483 BLAKE2B 63bca5be8673ef4e274caf4e0813b73f5dc8af7818b7638b2ac7411bb1598272bab573bc55c6c5e48fc45cc185bad907594b99ee0c96546683ecd8dd1ef1e3f1 SHA512 35bcbe35056d718ec5b58733b8569fd40cd6843a6661cc19deed02287cf65e03b4812fc82bdb0d54b12a78d5547456463e8adf236d4a7f04e11d0d462fe3eded
-EBUILD pyhoca-gui-0.5.0.7.ebuild 809 BLAKE2B bc974a3908bc993af18c86483bcfbdf655dde6cbb2c7ba80229f8dce0efde64e6f7222c1b53a119ba57f3f1d1f7714349afef887abd370de3f95df3a912f038e SHA512 c4e457b3f8d597fabc3842cde26f5acd5fad4a54d7849a0c1349aaf253146217ba8695e9ebc879bdec939dad897e5f57680e7121981da0483ae8d4ff382ec092
+DIST pyhoca-gui-0.5.1.0.tar.gz 2098593 BLAKE2B 942caadb43654dbd65cfb50722f17b93b2becd410b90fb888a5133974b66ae377ab568204288e3a72441b74ad3e08a31190d67452a41086802177cc6a8f01406 SHA512 ae4287ccf2aadc4a6557c3bf37d01eb2cdfa542803ece41df02b7b816ba5b0be918231b40dba3c39a850064ae39907befdef1b80180649446b49fc975abbe312
 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
 MISC metadata.xml 791 BLAKE2B 7f823d058d401072a1e1407391c2eb02c0b70705f5beac53656d582b977455201f0687c3b93653314be45339dfc749a81a06197a3e6e1b0c78205986fbf033ef SHA512 5e05aefac383cb0cc65e2747aa5d9eef23b2f26931196fa544f263a0c0bf2dfc63c026fa606fd910ab589f447d3bd78f42de0bff61a44286964098531000a5cb
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild b/net-misc/pyhoca-gui/pyhoca-gui-0.5.1.0.ebuild
index 6ea82c839c84..fe06961e4d65 100644
--- a/net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.5.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
@@ -19,7 +19,7 @@ RDEPEND="dev-python/notify-python[${PYTHON_USEDEP}]
 	dev-python/pycups[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
 	dev-python/wxpython[${PYTHON_USEDEP}]
-	>=net-misc/python-x2go-0.5.0.0[${PYTHON_USEDEP}]"
+	>=net-misc/python-x2go-0.6.1.0[${PYTHON_USEDEP}]"
 DEPEND="${DEPEND}
 	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
 
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index 00fb1ac6a8a9..9fe8e5040796 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -1,7 +1,5 @@
-DIST python-x2go-0.5.0.6.tar.gz 198236 BLAKE2B fb39afe9dadf104c8e348ad699539522977da839c8db2df23b3b976e7603064c4882d1a058e194847553e3a2c3e614e242e5fc0bd117f55594e7de0d682d9ed0 SHA512 bad064490ed1b30ec63631d4e6af4ad133f4f1049e60f345dfc0a45abfd5d54a54556953baeae40bb543573d23987da745ad67bf6270f28be4dd6b130a05a9f2
-DIST python-x2go-0.6.0.1.tar.gz 243623 BLAKE2B 60d0b6245d089f168bfc8c47f6360f53cecf5553de04a741d5993c2a78875bbe4367ae5c6d430b472df1870ed3b12cf9a11a046081fe1272d634ee1a46ff2afc SHA512 d4ee7b6d8a6efa8c6071cb5e899c624e3f4527ab8da85c4a088ccee02dd518da0da2d49b5cfb4940f585939b5761ddd9aacb00cb82e2c21c5b22cebc2d0575df
 DIST python-x2go-0.6.0.2.tar.gz 243857 BLAKE2B 9e64ed5f28a231396ea5322c51942814df2d80f1df092c1a33b1884bbadcf4b27b8180b3a2f9b07001ac3e90ab2e65bde594f83d3adadcc788e0236d738bb746 SHA512 883c26b01bdcab9e57f4ef4ac5a980f849cd2df849c77d1b82e11bbb1872c6e97f3ff8b02c841d8e3acd425f3f55da2613d31a3876ffcc91545195aae5f88d77
-EBUILD python-x2go-0.5.0.6.ebuild 591 BLAKE2B 9f661376976d06605f0480d3396cfa9486031f491c4d1561b4fae07f44e192c1f85b072f11613eee45d7a4e6d4ddb739b01296170671012221bb0a7abc239d0f SHA512 fbddfe4f5dae098c33f30047d369d3fb9d0c2d9e367200396b9ff7f1f095c5b45d5be316bed423547e6b1ff69392cce6cceccae7bfd508ced473d945d6bed1fa
-EBUILD python-x2go-0.6.0.1.ebuild 602 BLAKE2B ce7d2e0dabc87fc36298214494bb95b000823f561a13d9d453b888bc0d929252bf3ea730e4b8ab145ab003b5df75252f8274b864cce9fefd7d8bb038a5e43148 SHA512 b94fd3a989739df4c8badf16bcf0aeb927536ac310164d991cc8cfca26070b55072ea286f83ce1954e41a7fdb4e8faf415fe140b012bbf796b62ebce7485752e
+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
 MISC metadata.xml 483 BLAKE2B 556d85d173fd848484a7ede8e26d1b66fcfc95c49c1231b12273a6e8bbc42c4421fbc1933f7aefa846369f474caa25163095774daf6be7680c6b3b79b09c3e67 SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e
diff --git a/net-misc/python-x2go/python-x2go-0.5.0.6.ebuild b/net-misc/python-x2go/python-x2go-0.5.0.6.ebuild
deleted file mode 100644
index 8f666b8ffe49..000000000000
--- a/net-misc/python-x2go/python-x2go-0.5.0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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.0.1.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
index e9d9ddc2fde1..05ccc95bd653 100644
--- a/net-misc/python-x2go/python-x2go-0.6.0.1.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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_{5,6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 604b343efcf9..e512e4c3d030 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -13,5 +13,5 @@ AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a3403478080
 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
 DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
 DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
-EBUILD quagga-1.2.4.ebuild 3679 BLAKE2B cca0279f07bd1ba907cafc5e0f99cd59ae122f832579874f16768dd7b32de490b6673123a4bb42e007037229601cfdd796f2b88d7ccda072fbd9b39111a6e577 SHA512 3abb62c91f195d7a96c063dbfe6ca204c3f908259ab52287a2d790937b33902c439d7e865238dd2fd9397924af4debdd5a86a6b9c4a75710d26bf4cb64962b94
+EBUILD quagga-1.2.4.ebuild 3703 BLAKE2B 61b52af630d10fcda2158df2bde80527310d765cd1890e4489508310e1576d659f7559334403ed8af3376cbbdc765ba00b71cd0d784565d5d7feab8c010f6969 SHA512 3480b1f19bb5d5f2b61ce41800d83c7f912a330fec991d9398cba58b8520f9accf886ef27227634ad2c002045c92c455c912a580dd06fa0b4d9ee8d7a0f8ad6a
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.4.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild
index bac79f4ac542..788e47a3c8f3 100644
--- a/net-misc/quagga/quagga-1.2.4.ebuild
+++ b/net-misc/quagga/quagga-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	caps? ( sys-libs/libcap )
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 6759d16b97d0..db8bd40f5acc 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -6,10 +6,14 @@ DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df6197
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
 DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9
 DIST rabbitmq-server-3.7.17.tar.xz 2808260 BLAKE2B 45a77ebb81d1199219b3638f03698d147b5dd43160647f829163ee35607a3d7ada281b7156f555614b1eec7295e32d241410b8a691bccab2f40f1c548d2e0b51 SHA512 33af52a3f95854e7b3e067308181e37c7b9715b24e0ceb690d606f3e69a8be9cab258a18b68681350c31a01e4fa530825473bf652c7ac10894d36af4fa573a38
+DIST rabbitmq-server-3.7.21.tar.xz 2852548 BLAKE2B 1d437b86e2995bd0101fbcc0d55153bd2a8298b0a12eb8a1f9c2135868a6d349c0ba786371654eac684b6834b37aa6753e81581709e4879f911ac670069f595c SHA512 94a0d470e0ab2ad7ff5b3e195a127696cf538c257f1a5e13406081d381e6749549105c3be9a3385a82f7495bf312ad3b5c728d1c0dcbc0e4c89c2e9393449ab4
 DIST rabbitmq-server-3.8.0.tar.xz 3262332 BLAKE2B f72fc1e2b186ebd3e17fc17ab3d2ebe5186d59de3e6cf269b51977a2cec78b33ec9b95cf44b111b20f3f4d5227dc3829aebdac3044ad3a9e3f3e8e4a9cb7b740 SHA512 9d73cb81190ed3e473f18c21513a3e57fa53a0d3a38fa96f09c3282558421997b8d177195163053e845980f52297bf4e2716017de15abc2660daefdacea584e8
+DIST rabbitmq-server-3.8.1.tar.xz 15167384 BLAKE2B 3f13e5da74e4dd0bcb0ea495d2e79e0adcda4b697f054b0ac0df029833f77f5096ec636fe291881e27540cbb8ccfde71a330c0959b80b1ac82bdfceff75aeb4e SHA512 9db6d1b2e6c946190666cdbd60eed1bb7a42159834e4dfeb4fab1f3c7b6111236338cf45d619d7ffc10c10ded39ec322507386b03bbf8148afb9e457a232c79f
 EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a
 EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50
 EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf
 EBUILD rabbitmq-server-3.7.17.ebuild 3107 BLAKE2B 9addb1aa27f75285878de8689555b079fc9a603c93b22226aa06cb84d9b9185ef5ed26fe8740a5cd776526c68b96792bf338494b5dabd5f80d1b749359bc58e8 SHA512 5f1da605aca09ab102cf3343b96c6db5a2b9cbc2b54f5ffedd547db1ee581b297b3955e668d497e7dc6842e56753be6e96af6b09c368e4d8df8e0d6e852ea64c
+EBUILD rabbitmq-server-3.7.21.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7
 EBUILD rabbitmq-server-3.8.0.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7
+EBUILD rabbitmq-server-3.8.1.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.21.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.21.ebuild
new file mode 100644
index 000000000000..89c3839ec0da
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.21.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/erlang-21.3[ssl]
+	<dev-lang/erlang-23.0[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.6.6
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "https://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.1.ebuild
new file mode 100644
index 000000000000..89c3839ec0da
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/erlang-21.3[ssl]
+	<dev-lang/erlang-23.0[ssl]"
+DEPEND="${RDEPEND}
+	app-arch/zip
+	app-arch/unzip
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+	>=dev-lang/elixir-1.6.6
+	dev-libs/libxslt
+	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+	enewgroup rabbitmq
+	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake all docs dist
+}
+
+src_install() {
+	# erlang module
+	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+	einfo "Setting correct RABBITMQ_HOME in scripts"
+	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+		-i deps/rabbit/scripts/rabbitmq-env || die
+
+	einfo "Installing Erlang modules to ${targetdir}"
+	insinto "${targetdir}"
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
+
+	einfo "Installing server scripts to /usr/sbin"
+	rm -v deps/rabbit/scripts/*.bat
+	exeinto /usr/libexec/rabbitmq
+	for script in deps/rabbit/scripts/*; do
+		doexe ${script}
+		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
+	done
+
+	# install the init script
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
+	systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+	# install documentation
+	dodoc deps/rabbit/docs/*.example
+	dodoc deps/rabbit/README.md
+	doman deps/rabbit/docs/*.5
+	doman deps/rabbit/docs/*.8
+
+	# create the directory where our log file will go.
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/log/rabbitmq /etc/rabbitmq
+
+	# create the mnesia directory
+	diropts -m 0770 -o rabbitmq -g rabbitmq
+	keepdir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "RabbitMQ is now running as an unprivileged user instead of root."
+		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+		elog "Please run the following commands as root:"
+		elog
+		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
+		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+		elog
+	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
+		elog "IMPORTANT UPGRADE NOTICE:"
+		elog
+		elog "Please read release notes before upgrading:"
+		elog
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+	fi
+	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
+		elog
+		elog "This release changes the behaviour of the default guest user:"
+		elog
+		elog "https://www.rabbitmq.com/access-control.html"
+	fi
+}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 7285a33440d1..3c671185873f 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -8,8 +8,8 @@ AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d27
 DIST radvd-2.14.tar.gz 211461 BLAKE2B 0acdd23d1606d7dc5df3a8c8e2d3be7f6178bde866b9463b2a645a78b4ed710e8c60bcd32eff9456b80a993c3544a71721199298fccb184b357bc2ac51651f55 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02
 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
 DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3a00a67e5d8beeda139a70a574e69c0d8fde2c2754b6e9c9e92a97dfb6a2a67b4b3ce91740aa8edee994c5e SHA512 b66068ec40d4f228f679946039d7c696bf611eb55b88cb37bbea5e748cf7cdda796dc0b12e0f1e54b26a6af21750c8714ea18a152ef932741c0f0a6a7a9de59a
-EBUILD radvd-2.14.ebuild 1753 BLAKE2B 5fa3609a1d5defd9a0f5991d22ca7c38c5a9381181d448598d0f50e47a173e096f7d8a77e570e92a1f62b94be497729c299e9061038655757df253f9062d469e SHA512 b8ae5d96255b4a8ac0739ab94a086feffeb05cb555b6d431d8466b0e4d2150f4741d6b3e32b82f5137a04173579411e3abfd04171b6df707d4a552b4add62c7a
-EBUILD radvd-2.17-r1.ebuild 1565 BLAKE2B 0c0e880d7c32ca601e93b1d1e029b49dcea6b6c84825e7625697a0b9e0bd5cb935b384d551ce6a1c96c5fd0934eff0321e627b8f7e6dfee56b087edcaec49fbf SHA512 0cdb79b19e2a3a79f0247b0d863bbbc2dff5689134793e75e50a81cf8d0f87a5c5e98a0ad585a7292df544f92197a7876bfc41ec5f476b498597bda10ad69252
-EBUILD radvd-2.17-r2.ebuild 1618 BLAKE2B 182440a2884d176cc5bd32c00f8c6f75c8cf0f271959e159cba2567fff78bebde548b092a86a87e72864bd0aa9f3f284815a1f8d181ba487c6fd1b1ed18203ed SHA512 c14f3014f888d6af822bf684584580f96bdc81385a64950a48ad37a4a459ccf6a2f96382b61dba8abf9149e903a5e9bad7f223a9adfea85f16c6eecfb93caa54
-EBUILD radvd-2.18.ebuild 1574 BLAKE2B aa313976d6d69c2b6c13b04fc78643661862a8a5a092a5c993fee0951f34c55ab422b006f58e0a621b5f8af8332b259b474e42e139ec8e046ded4e67bd95fd54 SHA512 d5e15cd5024fcff8bc742cf79aa02ef35291f95354f170227d427d2209df1a2d5782b29ee21886229b6536822853830a2b64eb909b06f26c5e0cf80492e94c51
+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
 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild
index 64c4a4c91346..8f55c47281ee 100644
--- a/net-misc/radvd/radvd-2.14.ebuild
+++ b/net-misc/radvd/radvd-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86"
 IUSE="kernel_FreeBSD selinux test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/libdaemon"
 DEPEND="${CDEPEND}
diff --git a/net-misc/radvd/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
index 79f1e7f13898..4b9d53ef901a 100644
--- a/net-misc/radvd/radvd-2.17-r1.ebuild
+++ b/net-misc/radvd/radvd-2.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86"
 IUSE="kernel_FreeBSD selinux test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/libdaemon"
 DEPEND="${CDEPEND}
diff --git a/net-misc/radvd/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild
index 7715570cbd92..7ad88c71c468 100644
--- a/net-misc/radvd/radvd-2.17-r2.ebuild
+++ b/net-misc/radvd/radvd-2.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
 IUSE="kernel_FreeBSD selinux test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/libdaemon"
 DEPEND="${CDEPEND}
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
index e9d632e6d082..2076f18bb70c 100644
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ b/net-misc/radvd/radvd-2.18.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ppc sparc x86"
 IUSE="kernel_FreeBSD selinux test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-libs/libdaemon"
 DEPEND="${CDEPEND}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 3073c826e873..46c8556b23b5 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 1684 BLAKE2B cc0132d1dd28d79e17408f2262abe8b69001c790084e8ab10db69bdf0a3f89ee8fac7e9066d9fbc392889ce4ef4d5efffe8470ed241e33daf0f415fd2c23a8b2 SHA512 0e4321e237ff0e64634a1da949da9b8670158de391679cf6643a18232b9e21665b3f1faa37bfde2ea44c37408451d3bb897f498316973d24036535c5c30e30c6
+EBUILD rdesktop-1.9.0.ebuild 1705 BLAKE2B 0c0ca98332054fda07914776cb4888058676440f21559146d6b94c2edcedc28a6b88c39aadd93cd2c71bbea98377d07b9b6996eeb0cf829ef87361a23e507159 SHA512 706f50eba61539499541fb912bdcc374a14161dc5c6305d6e6e32164459b395ca85ca4863f9995c42f39e5881becce6f725fdf98c9c59197a917818931a557e3
 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 2a3e18a9ba61..9ff04c378e55 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	dev-libs/nettle:0=
 	>=net-libs/gnutls-3.2.0:0=
 	x11-libs/libX11
+	x11-libs/libXcursor
 	x11-libs/libXext
 	x11-libs/libXau
 	x11-libs/libXdmcp
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 377c1ecd2955..20b3dd8772f3 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
-EBUILD remmina-1.3.6-r1.ebuild 2479 BLAKE2B d25a1515cc3973af45ed83881be16e163593c90e18b66ecf8f2687ec140eccf68b509f447ad2b410c9613345d46a41a15a1213dec343e4f2d446e4bb1452a97b SHA512 09d31ba2b791f621e4cb14ac865815a2292d0f01c49720000345e5105615764a48ca9646a5609121e6a2158c999b8ac3b5ceb5e6ea2d8509d471f2d97e6355cd
+EBUILD remmina-1.3.6-r1.ebuild 2477 BLAKE2B f0912aab7e270c36283a9a82a04f3f171ab5fc56e084aab967b701faaa3cdfde7d556c13fc2c3f232a19923e32856dc7e8e80aa0a01b3aadd6d6b9af1a8ef633 SHA512 ec36b830cfeb182d5977913982b829a7fad1fe8c7230781b8df59eb80ef16ee5218f13860cea8a99513fc3aee0cfc442ee90de248ec65729ed0034f9a4e6336e
+EBUILD remmina-1.3.7.ebuild 2479 BLAKE2B d25a1515cc3973af45ed83881be16e163593c90e18b66ecf8f2687ec140eccf68b509f447ad2b410c9613345d46a41a15a1213dec343e4f2d446e4bb1452a97b SHA512 09d31ba2b791f621e4cb14ac865815a2292d0f01c49720000345e5105615764a48ca9646a5609121e6a2158c999b8ac3b5ceb5e6ea2d8509d471f2d97e6355cd
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.3.6-r1.ebuild b/net-misc/remmina/remmina-1.3.6-r1.ebuild
index 78a79a444080..be0ef1fe0bfd 100644
--- a/net-misc/remmina/remmina-1.3.6-r1.ebuild
+++ b/net-misc/remmina/remmina-1.3.6-r1.ebuild
@@ -13,7 +13,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"
+KEYWORDS="amd64 x86"
 IUSE="ayatana crypt examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
 
 CDEPEND="
diff --git a/net-misc/remmina/remmina-1.3.7.ebuild b/net-misc/remmina/remmina-1.3.7.ebuild
new file mode 100644
index 000000000000..78a79a444080
--- /dev/null
+++ b/net-misc/remmina/remmina-1.3.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 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 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 )
+	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_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/rygel/Manifest b/net-misc/rygel/Manifest
index ae94a7bed8af..967006929846 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,3 +1,3 @@
 DIST rygel-0.36.2.tar.xz 4057356 BLAKE2B 3ff1a0df12cdda694ded3a9a5c6d1495eaf0dff7133cbc84b73ad6bc767cd3a5e31ff8b579aff9c0de455f149e49dc972f7d93d64424d25501b02f2a02f66552 SHA512 8c079f83a00c9ad237b634e6274d27acc94a91adfa2829f0336b2485aa801e6898c30ec7268352247f1d12232d9ab3cb7a6f8215370f03aaff5323c4a8fdff7f
-EBUILD rygel-0.36.2.ebuild 2172 BLAKE2B 2ba08491b403ac96e2d66bd7374bfec6dbb599821de4f954d098bb9251c3c3eab10518df93837f6be7632e045acba251f3bdd805023d17a5ea276873f774d6f2 SHA512 511b19f3e10ac9f66624a13e6a2f37f4e87416ebf47109399ddc9aefbbdbd71d0678fe55bceda17397c4c1fc83469de3e7d8c0f25a30caa2aa3a5a900a4d5232
+EBUILD rygel-0.36.2.ebuild 2199 BLAKE2B 34d05fccbab4270c852c09f9ee842b29da78e2c03645f1f0b2ffe7d31a0943de3cdcaa9040746e531114885631ac2d9fb902af39ab39a123f73dcc00d5d98be2 SHA512 8dd214277ec39e3d623280d1fc54b9592219f2df18a4bb8d362d770c5b15ec646c818cc608c7de5b95b1c340863b11add945cd55d9b148da6a288a98c37cd8fc
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.36.2.ebuild b/net-misc/rygel/rygel-0.36.2.ebuild
index 9872de3d9e4f..5c5186b3df90 100644
--- a/net-misc/rygel/rygel-0.36.2.ebuild
+++ b/net-misc/rygel/rygel-0.36.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="X +introspection +sqlite tracker test transcode"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 55c67db36721..fb32593e4932 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -3,5 +3,5 @@ DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e
 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 591 BLAKE2B 792ac4375fb31a93569a1f756c90e5881e77c5ca95d672313b9926fb4be2face5c8cbceacc2e1f542381539044e7e47f39c48f136491faf7d2914ba4b391d089 SHA512 a59e652a147522b813ec57aaccadb7b4f838b15a2c34332cc3d6ff128118d3897f62e18b3196ec806fc0680fe50d22f9e2cf63a4c7df59c495b30777081436fd
+EBUILD s3cmd-2.0.2.ebuild 588 BLAKE2B 63c26445a24da6ace6b796b93af97eb7770c660666d716d4a42ef3ffaa4cbc10f14a0547ad5ca2e43bfc8a1c0a5f38c64246283614c70c7eb425d5667e853de7 SHA512 e0dfa4db2e7a8ed2758f63eb77815c3dd3ec5fe57052141a099ec72e4bb449c642fcc7e4421c10f153863cee30ea3a1da40443037baa9e1027e9bd59557688d4
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
index ad3819f0ab0a..07a0a31cd32d 100644
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ia64 x86 ~amd64-linux ~x64-macos"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 2b84985785b2..3f7b840516c2 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -1,7 +1,9 @@
 DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb9915be08b0fed10447fac3bf3acf8587153bb15d3b2c4750b02e7fdba8793253d7145afe9aef83a10efd33df3ee46c67 SHA512 c99afd9bdbd5003f57de8f88f091971f0269cd8efee5791c3c4aa90ad34b978d0f57724d4128e9d20d6a40d731853bb4bdaa76dd860f975ff7f84a56b0050256
 DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762
 DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3
+DIST s6-networking-2.3.1.1.tar.gz 87461 BLAKE2B 43cbb0762c48c31f0ee2f73605436397c2f7ae34bc788844c9fac0f15bd5a5693a8499c808f913b3cd5db53b30c7ffa425ce764c1d701b950c8b18421ff3e8d3 SHA512 3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b
 EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3761879665c771fd465e22e0cf095a76127f0b01eb891316366452d8fbe4065ddaaec7f157549ca72e6f21e97cc9d4cafe SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c
 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
diff --git a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
new file mode 100644
index 000000000000..a6ab1df980c7
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
+	>=dev-libs/skalibs-2.9.1.0:=[static-libs?]
+	>=sys-apps/s6-2.9.0.1:=[static-libs?]
+	!static? (
+		>=net-dns/s6-dns-2.3.1.1:=
+		ssl? ( >=dev-libs/libressl-2.9.2:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=net-dns/s6-dns-2.3.1.1[static-libs?]
+	ssl? ( >=dev-libs/libressl-2.9.2[static-libs?] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index cf660fc0b2b0..d63ee2342967 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,5 +1,5 @@
-AUX scponly-4.8-gcc4.4.0.patch 571 BLAKE2B 8934806f75ebf80afabe11bb5d63ce1d1716fdba12c7dd31875c0ac0d5664fe254e80d4d4880b0c875487600ff8825104517df9f16a1b7d07a66e5ebf7d80268 SHA512 2e215ab2c39bb0550345725d3d509354be88144000072e5e14eda9f0ecb1bcc4c418e76d9db85ef6d6568962efc4472fe28d855e15adfe2bc5ba78c69d293a12
+AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb25e4a32d6eab5c94e55a3d14b77e4724b7c1e70f8a39369becc554d20953bc9f43d44923582f41ed02adc37f665 SHA512 fd9727364591d528e17845eb3e103728382fa7b476b9c0331f16f3e09dc469df7068412047a30b554578887e7897e80574ac820314ec0dae5d58909e3bb5f7de
 AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
-EBUILD scponly-4.8-r5.ebuild 6848 BLAKE2B 743b3fd102a128968d4bf9aee0575fd8b36bc93b5e942a2145dfa72fdd464ac75b26b297daf6a307d51988cc25338f0b56fdeb8a6dc46f1f6b10fb50377a287b SHA512 da4fd7c60c5b268823f9d5083b8578ae22d3678963f44cbc2ad0420522f5a28843b78f21d39e1decca4d9b462a0f426cb74cb349055515f3e81970f21274e266
+EBUILD scponly-4.8-r6.ebuild 6872 BLAKE2B 157742b3ba96711c41389bf038c112438de483145cfc30357499b3e2ddfb3cd9a1d7e5cdfa1c839cd7faaf9a0f82f938adb8f2f135ef7a6ca7ea1ba70728adb3 SHA512 a51fe4efa6d1aaf45aea4ad8c221e02f07533d5dbfff50b0bf34da73252ef5f6be80def1236611375bdbe18862dc60e5dbde24b7af3d56e664981247d34b2aa1
 MISC metadata.xml 1443 BLAKE2B 2a5a24d22c30cfafe590841b6d6e4eb73d9c42dddc469e617c79585eaa05a3a7b1bf31b6cc6fc0f7b1c521610d969e6c40d197af08e3dcce37b7ce65f67d259b SHA512 b44a26ac0944e8b0b99bfd62a21684b9846a52e416a2874a1af9bbcdf270ff337dd26a55a24c6b4dd131ba51ef3b7b40e1375478a14049392782a5adbb1fed07
diff --git a/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch b/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch
index d08ce28b93b5..8bb689f5914d 100644
--- a/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch
+++ b/net-misc/scponly/files/scponly-4.8-gcc4.4.0.patch
@@ -1,5 +1,7 @@
---- helper.c.orig	2009-05-11 00:33:08.000000000 -0600
-+++ helper.c	2009-05-11 00:39:59.000000000 -0600
+https://bugs.gentoo.org/269242
+
+--- scponly-4.8.orig/helper.c
++++ scponly-4.8/helper.c
 @@ -259,11 +259,11 @@
  							PROG_RSYNC, logstamp());
  						return 1;
diff --git a/net-misc/scponly/scponly-4.8-r5.ebuild b/net-misc/scponly/scponly-4.8-r6.ebuild
index 2e53a29f0870..c7b2b8ba88d0 100644
--- a/net-misc/scponly/scponly-4.8-r5.ebuild
+++ b/net-misc/scponly/scponly-4.8-r6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils multilib readme.gentoo toolchain-funcs user
+EAPI=7
+
+inherit multilib readme.gentoo-r1 toolchain-funcs user
 
 DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
 HOMEPAGE="https://github.com/scponly/scponly"
@@ -22,6 +23,7 @@ RDEPEND="
 	quota? ( sys-fs/quota )
 	rsync? ( net-misc/rsync )
 	subversion? ( dev-vcs/subversion )
+	unison? ( net-misc/unison:= )
 "
 DEPEND="${RDEPEND}"
 
@@ -29,6 +31,11 @@ myuser="scponly"
 myhome="/home/${myuser}"
 mysubdir="/pub"
 
+PATCHES=(
+	"${FILESDIR}/${P}-rsync.patch"
+	"${FILESDIR}/${P}-gcc4.4.0.patch"
+)
+
 DOC_CONTENTS="
 	You might want to run\n
 	emerge --config =${CATEGORY}/${PF}\n
@@ -37,12 +44,6 @@ DOC_CONTENTS="
 	the SECURITY file.
 "
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-rsync.patch"
-	# bug #269242
-	epatch "${FILESDIR}/${P}-gcc4.4.0.patch"
-}
-
 src_configure() {
 	CFLAGS="${CFLAGS} ${LDFLAGS}" econf \
 		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
@@ -72,9 +73,9 @@ src_install() {
 
 	dodoc AUTHOR BUILDING-JAILS.TXT CHANGELOG CONTRIB README SECURITY TODO
 
+	( docinto chroot; dodoc setup_chroot.sh config.h )
 	# don't compress setup-script, so it is usable if necessary
-	insinto /usr/share/doc/${PF}/chroot
-	doins setup_chroot.sh config.h
+	docompress -x /usr/share/doc/${PF}/chroot
 
 	readme.gentoo_create_doc
 }
@@ -126,7 +127,7 @@ pkg_config() {
 
 	# passwd compatibility
 	if has_version "=${CATEGORY}/${PF}[passwd]" ; then
-		BINARIES="${BINARIES} /bin/passwd"
+		BINARIES="${BINARIES} /usr/bin/passwd"
 	fi
 
 	# quota compatibility
@@ -197,7 +198,7 @@ pkg_config() {
 	for BIN in ${BINARIES}; do
 		einfo "Install ${BIN}"
 		install -o0 -g0 -m0755 -d "${myhome}$(dirname ${BIN})"
-		if [ "${BIN}" = "/bin/passwd" ]; then  # needs suid
+		if [ "${BIN}" = "/usr/bin/passwd" ]; then  # needs suid
 			install -p -o0 -g0 -m04711 "${BIN}" "${myhome}/${BIN}"
 		else
 			install -p -o0 -g0 -m0755 "${BIN}" "${myhome}/${BIN}"
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 6287fd703982..8d3e38ed5f6b 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,6 +1,6 @@
 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 1079 BLAKE2B 1c0063f8e7a59724543578fd7b86afba18d613d310713446790c4fd01e5f0a0d0a15f0329dfa60e55c80b0cec8f190ff137ebf3bb533fee5a003e60385521e93 SHA512 7fd40b48cbf3fc6533c56450f8fea78aa3685ebe9c04e40172ae18a5ac8f2a25d6e05567d6b35385485e64a3dd51336b2fc69f6baa9381d302d0a9f1410f60e5
-EBUILD seafile-client-7.0.2.ebuild 1089 BLAKE2B 5b6c502226191237424bf3bf90e394faadae6739be6c9b8bca3bfd89517adfe29d4bc7fed666eaef88fba6180e0d173faf29d954c6dca8ef6364ac346d1265f0 SHA512 05af2e61619a742929888e6f1a22b52576172d0ef0bbe4c6b90adc699d9da07ec1b959a18c15c0e0e5da4b63f69180ba6ed75dd9ef206894304181747cd0e9de
+EBUILD seafile-client-6.2.11.ebuild 1106 BLAKE2B 5610e8f4e38a4b2287b1f9dc2efaa3cafeae444412aab0e36ce7a01dfecb4c153b2e6e91a0088c8222701b3c9056fc415909af245d730109bf195964e74fded8 SHA512 38802b16e0bae3b31cf15e0d3df8b7c938e0833485e9b04bb17132477f86d3c2358980c9613a8faaf32b30766d0b7e33df90fa384c346df26b765365ea0202c5
+EBUILD seafile-client-7.0.2.ebuild 1116 BLAKE2B 2fec5abafda283a0d0a670b655ec85d7e1ed3f0e9b98828ad5fedcedf900bbb3423dbb516a3bd94e59d7115fb9283cdc9a8a2dae9cf7779e61565d1fad823230 SHA512 815a189dd7852cc588ccc5a2b8d0ed518712ca2b83e87a691ac6efb25e3f79afaa71d85bfefc98b12749ba733a15b33c774134bf81eb3e0ccf9de6b507387276
 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 422282c9fbb9..311ec1fd77c6 100644
--- a/net-misc/seafile-client/seafile-client-6.2.11.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
@@ -12,6 +12,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="net-libs/libsearpc
 	~net-misc/seafile-${PV}
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 8305fcd55b44..972e54b95f82 100644
--- a/net-misc/seafile-client/seafile-client-7.0.2.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="net-libs/libsearpc
 	~net-misc/seafile-${PV}
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index d776f2ce514e..eb5c7769ef1b 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,5 +1,5 @@
 AUX 0.9.6_p1-callback.patch 490 BLAKE2B 398728ea4fb79a0c8ab2e1920f08186df358bb7924674a38526432c487d453b4a679b731692cc06cff0e10b76b3558462901bf367993d0dbe90bb0d9dd8e739a SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a
 DIST sipsak-0.9.6-1.tar.gz 158776 BLAKE2B c8bd37d63d55bc593a57455171ed2dd26c8a4e87746be7075af7c2912b400d49a44f25fad694e296c75ea9aa3e7b10cc81a457c448a3a9429a41d22b84fb794c SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
-EBUILD sipsak-0.9.6_p1-r1.ebuild 720 BLAKE2B eb257a64e411f6faab8e1abb076e676edf78ab8dc6d2a10a7566c059725ef3df4dafadc289c7084e5d7fa86ba671e364128515897f409b745a19ac59861e09d8 SHA512 9444d5028ec13dda04675f30dbc3b7d203d9d449ed491f2008690506e15cb599c8a180a9a59d78c0725455211e294b334160e9fa3a0102b9dba2680d261bea1c
-EBUILD sipsak-0.9.6_p1-r2.ebuild 765 BLAKE2B 022df7063a9d8f1a97f96111a8a736b612489edc817f2465ae626f4554718cc52216ce56d85f7f735df7f822327f7d8ea8af7904c05f32f6fb36064ef247f6a4 SHA512 4ecab6db4dd1dd94bdf174ec96f7d306726f286135ebc4460372610ffd313ec2725278e70998b67361c25608e1cd51ac8034f168458b69bdfbcd6ab5676e566b
+EBUILD sipsak-0.9.6_p1-r1.ebuild 713 BLAKE2B 43166e8df8a2ad2af8e6a50f32db19665b5fc05bedc81b92540a3c2b0eb01ed79a2df4082adaf02e1ca678a03030fbe7327a4f0712f49fa49d301a738c6a252c SHA512 2d876a88048d9248aeedea7df1d0e1ff00cc9f8c5dc3cad14b9e19d4d7d95e86f16bf317c91260f513a22826b1e02774a67168faa46b058bf1117dc13ef66959
+EBUILD sipsak-0.9.6_p1-r2.ebuild 758 BLAKE2B 865664393847d687882c8d49b2bc833aa614afe0d5ef3aaa1633c591d791f02c08bdf72339c4a249f34810cef55028f5dd58fb3543b49e8ac31e46810eba41c8 SHA512 4503bf957062070935e67e2814d9d4f06731b81171865ff7ce09895e1d23ac85ca59ddc0cb8705b4dfb2b096f719c4fde1b446fe42f02ee23b6e7a4b6f73289b
 MISC metadata.xml 303 BLAKE2B cc764a44b688e208776c7e99220318ff09e0cafc4b49a9b8e1d105766425f7c4fe59d85fdee39601ef066d59669eb8e6259cb755f997d400e1a8e13366a2bc55 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
index 8532201199aa..c82636600396 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
@@ -30,6 +30,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
index 6893d2605d39..8b19b230546d 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
@@ -32,6 +32,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 9a27d9c9ee52..b3061b300944 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -8,7 +8,7 @@ AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fd
 AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef
 AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660
 DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
-EBUILD sks-1.1.6-r2.ebuild 3653 BLAKE2B 8caf2015bc5c53e4ce415fe245b04ad0f541554d943cdba6fc9ae4a9ffe97d681d4046aa7d5777b6a2041cb3ff82d4fd03968e4b4d0f6d49589487c39ab2b9e7 SHA512 93f867791a3b09f58098b1e9047ea5e49c4abf04b2428dc8aabfc1834ae4f71d84f84f4e88ccc4e767c5e4d4171332ba4b16a1d1ab098314e58f29e664f9642f
-EBUILD sks-1.1.6-r4.ebuild 3522 BLAKE2B d7f08dd9963cab6143bcdc27b44ebf7466485a7236808047fd13d309c3867641bdb5c64d2d8291d17d16c81ba7e30b722fdff7f40e28be8e60b4eeee1acf868b SHA512 b93fdc43971b4d736da706189e4a300ae5d68100b52b41acbdc8930936893add99a33744b2733131ba8d0ddf861f5b81d6d53d3d25d633215a6b3298a7ed5fa7
-EBUILD sks-1.1.6-r5.ebuild 3665 BLAKE2B ebab8bc8e0d0cef205f8134f94ae489c4d1e640832c270626758b91360240a58d919b9daa285a0344d9fa620c4baa86d183b3c589d84ff25dba1156ccedec93d SHA512 24e6a92cb17628a01e389db2fe8cadef24baa5071c68529f99f9fb4e30ceece6752069f8a58159bb5a07f28921ef6c58e325e273c3940f4d13ef0b9b0a4cd7f0
+EBUILD sks-1.1.6-r2.ebuild 3677 BLAKE2B 354a2b89fcab9050ba7551ecff8da54b5ab8011605e936157396cde5cda30855a341042a9654737b26722fba81964036be394b048d3360ad99a075c0b1145a39 SHA512 0b37213e24548699dec3874a7e2bb9185df65d701f67f13ec7584ecde220c32a95aa9b7012fe2dee2fcd8a7972541dd0c785a5b17daaca976c0ced61699e4c59
+EBUILD sks-1.1.6-r4.ebuild 3546 BLAKE2B 8be2010b861536d6ac2307648728e54e5d2b9cc254252ffc3d88de1ef93cf38fa4bbd4a512ccf75378987319bddf142e8d91a2d656191f1f15904e9aae38a372 SHA512 2dbc5eb84b4d4b00c6ec2b01bd7f2323ab916337f9bdf10f06ba9b7d500c4b64b4625613cbd3e1755275ff44ff85d366c824b42fa51c18b88ef6985a537f8cce
+EBUILD sks-1.1.6-r5.ebuild 3689 BLAKE2B 5b1b9cb2b694b8e8415e29e93c0276d42e81f22873c721f67676a82f5da3de0d4b4026e72fd9275f70d2e3375ac974ac6a5597317d43c54654678600b4277afc SHA512 b9f0db5da7805b6748ca118c3feaf88f84ab1fa8a12ad7cf6d47547557a414d8240398577b5e6beaf8d2d08ea0a1c02f34685a1071c1a72df2a1b9c528830580
 MISC metadata.xml 421 BLAKE2B 533f545d0e35f30eed5eb31b56c1413ecc9534f9a3337627a08358149edb8f7101d71f0ffcb4d01ec234ae95deb7b26cd9f941a2d47b449bb1c6c360fbb63f11 SHA512 b9f538cac1e2b55791bf0a681eb715fb073de9bba6de1f53d911fd7269856a31dcb7d3c21a8bca108bcd49db10d3c9906ceef1f09a6f02773622bb484f56c61e
diff --git a/net-misc/sks/sks-1.1.6-r2.ebuild b/net-misc/sks/sks-1.1.6-r2.ebuild
index b51abaff4132..0f55ebd8306c 100644
--- a/net-misc/sks/sks-1.1.6-r2.ebuild
+++ b/net-misc/sks/sks-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="optimize test"
+RESTRICT="!test? ( test )"
 DOC_CONTENTS="To get sks running, first build the database,
 start the database, import atleast one key, then
 run a cleandb. See the sks man page for more information
diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild
index d08143afcd76..89cc2ec999a4 100644
--- a/net-misc/sks/sks-1.1.6-r4.ebuild
+++ b/net-misc/sks/sks-1.1.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="optimize test"
+RESTRICT="!test? ( test )"
 DOC_CONTENTS="To get sks running, first build the database,
 start the database, import atleast one key, then
 run a cleandb. See the sks man page for more information
diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6-r5.ebuild
index 8b50b33a7cf5..6555ea2c8bf6 100644
--- a/net-misc/sks/sks-1.1.6-r5.ebuild
+++ b/net-misc/sks/sks-1.1.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="optimize test"
+RESTRICT="!test? ( test )"
 DOC_CONTENTS="To get sks running, first build the database,
 start the database, import atleast one key, then
 run a cleandb. See the sks man page for more information
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
index f4ae2b79230d..66ec9c133195 100644
--- a/net-misc/socket-burst-dampener/Manifest
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -1,5 +1,3 @@
-DIST socket-burst-dampener-1.1.0.tar.gz 3188 BLAKE2B f9a13844aaff9961c52fbb3bbc2c44a6756a4586151f2fa2e25abe352d3407fd2588dc5cb69c050aedcf920ebc8b76d55316a7ecdf93451772fc0372da329718 SHA512 f77e3e0cb26655c1c4477309f358f3d167e6ac89cfbd1e21c12aff7f33a22a956a8d2c77c28c888360f03b9aff4c9b1fa7174e4830e874bfc515285189c36cb9
 DIST socket-burst-dampener-1.2.0.tar.gz 3823 BLAKE2B 44a24eb357647873e328bad302e89cb08ec48389deb0e2abb9b7cfcba32001805929b3e5df0045ca38e64d51fce0784e9bafd17b9f840d65e0114c25a4228592 SHA512 e2130abf33c95255dc4249fb82a628b2569a0db8582f4b42b07b0c2c88d7f3968634062a4befc9ab4a257c750e31dbc5ffc5512a9b1ab2e34c8f660f598da080
-EBUILD socket-burst-dampener-1.1.0.ebuild 645 BLAKE2B 7e658044e5f233c7c4a553d857e0cc721edfbbadc92b90a65982acf0dd2745e578673514509f0fc7c20ecc42664dfafb1475e92e0a819fbda2ad279c86fff35a SHA512 0e435ff229bc91dc06fc8ee2045b6516f4e055a5791db64ccb2d2711d0393dcf43b2f9583541c65eba421893da57ca6b4392384df56255ad21879292fcca65a3
 EBUILD socket-burst-dampener-1.2.0.ebuild 649 BLAKE2B 4126e418c3acff83b83380ce715e4d415fdb08e0242f06508acbd6bca4cbe661c2399ec3f96ed4a0075527a41e224836932f9186f6936415edc712872a497a57 SHA512 ad1d4988a37530ce289d94e2a55dba3771e307202f4256e0b398147c23e0489cbae1295699f48088ac0fed001febfa4702ae019eeb778401163d5c9ade091573
 MISC metadata.xml 312 BLAKE2B af48a35f7fa9f645522293faddb615bea586daf209350d9697863ddc979f489863cbad923786c8dde79284d103110347f095ca0dfe8913ea328dbd9d142255bc SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
deleted file mode 100644
index eac3307a4109..000000000000
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 )
-
-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-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 964f0d19018b..b5062d52160d 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,5 +1,5 @@
 AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 BLAKE2B d968d7f1abf69cc5c0fd3c72c690bca1e547b8f0a58424c59ce20c1570c5151b5313b18396f1462804ab0598672129ad31eb3036bb3590304eed733df69b18f9 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
 DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 BLAKE2B c47e3123f94504162cec237d6c2ff61825b655efaa9bff2710650cce3e2cb45b10ff842c4d88002461ab51c410dd9fc748ee4cdca7cea56e67bc22497b427e7b SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b
-EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 1002 BLAKE2B ad04539df5d8e3000750fab23586ee6a904b68ddd86653007561493a3310708f1674aee93e02c83fa0eda6fe40e72719960c6e8dc231b90c4d0fb6f53245f1c3 SHA512 52216707d7646f0ddb0ed6d2d73d10d02de2feb05460cfa012eb4239c6fe4b61780110fe6cbc58c741bdb450aebf014d9ed8b9af847e388ee6c49d7bc23f5319
+EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 979 BLAKE2B 7d6a94a4bf30c60477d7be004b4e99053f7c059ad2b04d75f73a6052bea45f3cbc2e3f61d4aee5370807810cfcf5a8219881f666324e905684af89091bcc2639 SHA512 4b0b7873b16d2a6b16206915e5006a66b952241277a9c1caabc5c05283653f187a6e656e6d5e0d7486a3af7573ab557df57196a5fffdb5b3c6cb46c134bf4925
 MISC metadata.xml 344 BLAKE2B 2059c989d9bd878eb050b6960dbe5444bd72eaecf4d6f532b2cfb26c830f65010cf7081e2e2a435d541f0b03f904697966ffbcdd7bc41281319689cc65b12163 SHA512 26eb499745d0f954b33834ebecef34ba44ad457837ea4c0b0a44e917513aabe6486887124ac5ce47d69c1756f2a00693ced7ed4dabcb35539d047f19deeb33f0
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
index dbd21787dcc2..ae3f4983f181 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -34,5 +34,5 @@ src_install() {
 	# Automatically display the passphrase dialog - see bug #437764
 	echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \
 		|| die "envd file creation failed"
-	doenvd "${T}"/99ssh_askpass || die "doenvd failed"
+	doenvd "${T}"/99ssh_askpass
 }
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index a73493fc5abb..94dca6bf5a21 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 1866 BLAKE2B 758a98d241d23ae7cebc684b6c4bba32a299367d8bfd2da00303fda8801cc7de12cb29f8651c31f44e998f9acd6afdb4f1e030a909af373202ddf0971dc48667 SHA512 4bad5f11c62c873c446c65974a8c29cb91137fdab9fbe0ce7c29004d45d6780f11a8691603da1649b4b17d89da9ce172074d67e2313ebbfcbe932703c3ffe7cb
-EBUILD streamlink-1.0.0.ebuild 2016 BLAKE2B 3df677b3d26216be7928269cca8b8d3b53d28ede18617e1ddce56874a405bde328e87c2168f09526a06160f8ff1f23f0109f166421bdb0e7299a4d06e2a40540 SHA512 977a6cf86917f9cd0025da1e39d8dd25b5870e88dcb8a6585caa70d8bdeaf102c24cd9b80d5aafcd1c21fc04f39358f9580a85838ebdfc5fdcebca01601bf1a2
-EBUILD streamlink-1.1.1.ebuild 2016 BLAKE2B 3df677b3d26216be7928269cca8b8d3b53d28ede18617e1ddce56874a405bde328e87c2168f09526a06160f8ff1f23f0109f166421bdb0e7299a4d06e2a40540 SHA512 977a6cf86917f9cd0025da1e39d8dd25b5870e88dcb8a6585caa70d8bdeaf102c24cd9b80d5aafcd1c21fc04f39358f9580a85838ebdfc5fdcebca01601bf1a2
-EBUILD streamlink-9999.ebuild 1539 BLAKE2B 2609504dfce4ba218fcdcccc25618cd569d5f056e97d9c482d7132cc7dd226fb2a566372abe654aaaa33d698b88b527fa32ed98880f3b49a0807321648018837 SHA512 126ef095ca4affcca4bde3bb54070c9ce28b6371cfae1a28ea31986daed5a389bdeebf20a3392d7aca0e34f2355ef804ad9848711aa7ba4dfa84f67db4ebca29
+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
 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 902f04a6bf10..7da7b06bc738 100644
--- a/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
+++ b/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/python-futures[${PYTHON_USEDEP}]
diff --git a/net-misc/streamlink/streamlink-1.0.0.ebuild b/net-misc/streamlink/streamlink-1.0.0.ebuild
index 667a5f466f57..eb8f741e43e7 100644
--- a/net-misc/streamlink/streamlink-1.0.0.ebuild
+++ b/net-misc/streamlink/streamlink-1.0.0.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 RDEPEND="
diff --git a/net-misc/streamlink/streamlink-1.1.1.ebuild b/net-misc/streamlink/streamlink-1.1.1.ebuild
index 667a5f466f57..eb8f741e43e7 100644
--- a/net-misc/streamlink/streamlink-1.1.1.ebuild
+++ b/net-misc/streamlink/streamlink-1.1.1.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 RDEPEND="
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 3ceafa2b28e2..4419ab99197d 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -16,6 +16,7 @@ KEYWORDS=""
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 2f9808f1b85f..456145c10608 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,14 +6,10 @@ AUX stunnel-5.54-libressl.patch 12341 BLAKE2B a46445e80f54ce9a912fb7b255600f3598
 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
-DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
-DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
-DIST stunnel-5.54.tar.gz 985587 BLAKE2B 3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591 SHA512 3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa SHA512 278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
-EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96
-EBUILD stunnel-5.50-r1.ebuild 2890 BLAKE2B ffa69c7b02614e5e43164dade91920f81f2cba817c0e8c057bc9a795c667f3f6f045697ff00499359b444c3f9e226c0ee044debee52cc2e9dea6c0bb233c637b SHA512 bd837960737a05e94d0905663ccc58d7216a054222af31b6ebc907e7855e5d6e2c995f0fb256b89df08dd77d7b8af0f0f362350f8e3f2f02ea91c6feb00853c4
-EBUILD stunnel-5.51-r1.ebuild 2907 BLAKE2B 2aa8773750af083b3db5e5a232915c73e3985b8a32424ef6a6c0660f51a33b8c1049ef48e272e889e386fcd98c0e8464e22fdfe26309b0df37ffa0912c61557d SHA512 2e45350897ac5423492a0e90a6cdd80125a5aab49d9db9ff29701f63604559846be9b95ee5f58698b7c210758b1f97a9d0991055c2d509497285204e6ca59419
-EBUILD stunnel-5.54.ebuild 2907 BLAKE2B f2f85b3b178486d0c6720cbab05be44feeaaf238e476bc43b216bf181435b3b092ce55b4fa2ef40592f06b8f84c0f7d705335c782df9fbc7dc9c6daf4d328d32 SHA512 ae6df10bc5c499b3a8e4835334358df143fb5da32b8c578ed7dbeace2b8d297e27315b0d1639b4eabdabe91a145c9a11d1b9a0e9ba761abfeeea411e3b045f04
-EBUILD stunnel-5.55.ebuild 2781 BLAKE2B b7c701090cfc2f84e212e1764d79a561dec909b140e2fb83b524bd26567143331c075b6e67fcc21afa5a816d5e38dae4de2f37591fbe86f6f09b566d6895791b SHA512 6a3b18c18f85d5e2a50aebd5cc112058ceefa739caf0c7c7ad41b3621dbdca11145892acce0d7ee1f2bb8f284bf05c10db5b79f7c4913d312d80ccb79a6da9c0
+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
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.43.ebuild b/net-misc/stunnel/stunnel-5.43.ebuild
deleted file mode 100644
index 6bb6cf8d3418..000000000000
--- a/net-misc/stunnel/stunnel-5.43.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${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:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index ee1ce7200b6b..15b3766822a7 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.51-r1.ebuild b/net-misc/stunnel/stunnel-5.51-r1.ebuild
deleted file mode 100644
index 0c9f131d6371..000000000000
--- a/net-misc/stunnel/stunnel-5.51-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${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:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# bugs 656420, 682894
-	eapply "${FILESDIR}"/${P}-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.55.ebuild b/net-misc/stunnel/stunnel-5.55.ebuild
index aa1cac189616..d382723f771c 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=
diff --git a/net-misc/stunnel/stunnel-5.54.ebuild b/net-misc/stunnel/stunnel-5.56.ebuild
index a36f2872e781..4ad962ee6aa9 100644
--- a/net-misc/stunnel/stunnel-5.54.ebuild
+++ b/net-misc/stunnel/stunnel-5.56.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit ssl-cert multilib systemd user
 
@@ -18,10 +18,9 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
+IUSE="ipv6 selinux stunnel3 tcpd"
 
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+DEPEND="dev-libs/openssl:0=
 	tcpd? ( sys-apps/tcp-wrappers )"
 RDEPEND="${DEPEND}
 	stunnel3? ( dev-lang/perl )
@@ -39,9 +38,6 @@ src_prepare() {
 	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
 		tools/Makefile.in || die "sed failed"
 
-	# bugs 656420, 682894
-	eapply "${FILESDIR}"/${P}-libressl.patch
-
 	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
 
 	eapply_user
@@ -67,7 +63,7 @@ src_install() {
 	# symlink for backwards compatibility
 	dosym ../bin/stunnel /usr/sbin/stunnel
 
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
+	dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
 	docinto html
 	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
 		tools/importCA.html
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 30a3adfaa0b9..c66be05c66a9 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,8 +1,12 @@
 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
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/files/teamviewerd15.init b/net-misc/teamviewer/files/teamviewerd15.init
new file mode 100644
index 000000000000..ff6e2b52a516
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd15.init
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/opt/teamviewer15/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-15.0.8397.ebuild b/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
new file mode 100644
index 000000000000..6650185440e6
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.0.8397.ebuild
@@ -0,0 +1,136 @@
+# 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/termpkg/Manifest b/net-misc/termpkg/Manifest
index 54d998095a1c..abdf1fdf113c 100644
--- a/net-misc/termpkg/Manifest
+++ b/net-misc/termpkg/Manifest
@@ -6,5 +6,5 @@ AUX ttyd.confd 1894 BLAKE2B 6a46667d927fe0849901ea48c5b38ff0963ddbe6bece03731203
 AUX ttyd.initd 2222 BLAKE2B 84063dbeb213caa3414c6dfb1d75791fda451bc91e7f6b201dd55b4f8eba88cd239f6d01986c255899ec9679d465cae617e71b7c68b16c291811edeedb709c2c SHA512 d778644393722fa00837f542bbbd772afc86801bf875430321d287adb7129b605bd12d8dd3a49a79795b58b188b4e7febc13546e7181a1ede278f9fbb40e47bd
 DIST termpkg_3.3-9.1.diff.gz 6759 BLAKE2B 94e139b2dfc4844dd13df075f8d0ab8b7bff482618c55b56d5cc1d67706b10cf04b6b135566980d4742edc46dfc65dcdd1d254bef96a57f4b62c5250a520537c SHA512 dbcba1bc020ead0ef5e4f2fb2e7ee50937dbd6d614e53547bf2473dc3cbf0f4f3100a15bcd200b815a4fcbfd454a08a3185cdb305c4f3bde389070b5545293d4
 DIST termpkg_3.3.orig.tar.gz 65807 BLAKE2B c4382d6689b3bac1f22407e55dd18373b36be1de88f0678ac93bc0dc9c43f07bc2172e4be86ae250d5ed8e9c89991f1842457f97eb646ec8054353d525d9ad7a SHA512 4dc1152af27af5edda66622435f5c5d46e9bbba9dc3e9e0d6349792efef9488993d9ea02eb8780bc05a0a29756a0ba3cf45bf8d1799906b55d166c287432c22c
-EBUILD termpkg-3.3.9.1-r2.ebuild 1327 BLAKE2B 810b9a6f0a61067583fa0a8580029888519e37f75510648fb7fd63c3690677689f30776bddef56694cf145a82a57426d650290deb3cdcdcd86d7f1cec0b54100 SHA512 cb038190abf59b53f32b563a3bf7aefe8dd8652fdc5ed5f2521d94428e77fdd2dc7236830215add79abc2f943e19b019c6202e84d8fa19f04d16d4faae9f5b8a
+EBUILD termpkg-3.3.9.1-r2.ebuild 1305 BLAKE2B 62f0230dde0681686ee74d53bb2d1ef23d7bd4c41e41acb8969eeb8a64111f0e2d74029632e8ef45e4935e5916b318106623ef8afd835bde0a03832a16d114ab SHA512 243d0bfd9535c6067aa42b6579e65be39d2a95a307c6c427c77f38ef2d30b9c63487649714606fa904917c505b05ffdcc2fb3f399e825c22831f14e1f315f1d8
 MISC metadata.xml 618 BLAKE2B 9085f03cee7c7c04ff92f4c0672c956cceb06d47abb7f74fcc917452b6c209bf92e3f467efc596fbea85e0b703e840cf99a3b0e7a8a175e54c5e58931d8a08be SHA512 b82080f75078bb82c6ba021c631e8ddd4af719a523a70b1f921e3221a37b1e766918680cb77f9fbc9af74aacf9c196c3264720a95cbdd902f042b88f1c21f75f
diff --git a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
index 9b4e786d429a..112f96195585 100644
--- a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
+++ b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}" || die "emake failed"
+	emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 5ecee12e9a82..7d99bf4e28ae 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -1,4 +1,6 @@
 DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
-EBUILD trackma-0.7.4.ebuild 1979 BLAKE2B b5a0190c8d128cf6c6419d06ae0cbfacd05ab2102ff6613ddff338da2bbc3e7936eeaf435171731e7b41a75668c8b8e9c8f5608b11efc091fb515a11d9d84b2f SHA512 034a2bff20f856767d08939cf1f151d71e4351bc118be26b086b4bfb64eb681cb0cc6ee44265f8be713c9d975d75e7650340e1f1fac8c9ef1f5c48958760dd2c
-EBUILD trackma-9999.ebuild 1931 BLAKE2B 3b52f598487bb469a890a96d978d31a4d796459da3908a28ce17994e0ad9a39709431152eb26bce72f4006449ed4c4582bb5d5422c4366f0e14877a5e06e7c23 SHA512 d953512cb15a9f05dd972487cc9f19a88b69b0f9810aee3755bd51b64e46965e22859832c97c57cdaa5518a3a3ddf34106398f443cd864f6f793db109a7ef9f9
+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
 MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/trackma-0.7.4.ebuild b/net-misc/trackma/trackma-0.7.4-r1.ebuild
index 1f5b5a79bb4d..5c7cd0c57569 100644
--- a/net-misc/trackma/trackma-0.7.4.ebuild
+++ b/net-misc/trackma/trackma-0.7.4-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
 		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 RDEPEND="sys-process/lsof
-	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
+	inotify? ( dev-python/pyinotify )
 	${DEPEND}"
 
 python_configure_all() {
diff --git a/net-misc/trackma/trackma-0.8.2.ebuild b/net-misc/trackma/trackma-0.8.2.ebuild
new file mode 100644
index 000000000000..fc1e2899065b
--- /dev/null
+++ b/net-misc/trackma/trackma-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Open multi-site list manager for media tracking sites"
+HOMEPAGE="https://github.com/z411/trackma"
+SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ncurses cli gtk inotify qt5"
+REQUIRED_USE="|| ( cli gtk ncurses qt5 )"
+
+DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
+	gtk? (
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+RDEPEND="sys-process/lsof
+	inotify? ( dev-python/pyinotify )
+	${DEPEND}"
+
+python_configure_all() {
+	sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die
+	rm "${S}/trackma/ui/qt/qt4ui.py" || die
+	if ! use qt5; then
+		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
+		rm -r "${S}/trackma/ui/qt" || die
+	fi
+	if ! use gtk; then
+		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
+		rm -r "${S}/trackma/ui/gtk" || die
+	fi
+	if ! use ncurses; then
+		sed -i -e '/trackma-curses/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/curses.py" || die
+	fi
+	if ! use cli; then
+		sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/cli.py" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon "${S}/trackma/data/icon.png" trackma.png
+	use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true"
+	use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true"
+	use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3"
+	use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5"
+}
diff --git a/net-misc/trackma/trackma-9999.ebuild b/net-misc/trackma/trackma-9999.ebuild
index c267a57aade6..aed3ebbc8ef5 100644
--- a/net-misc/trackma/trackma-9999.ebuild
+++ b/net-misc/trackma/trackma-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
 		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 RDEPEND="sys-process/lsof
-	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
+	inotify? ( dev-python/pyinotify )
 	${DEPEND}"
 
 python_configure_all() {
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 007a899392ad..6f9f0a216f08 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,7 +5,7 @@ DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 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 2460 BLAKE2B 81491952d6cfba07ae5bb03220c044fc0fa05a1a4d531e6b0909a4265620dc56259c24c6d1268b425d45db44210d2e9b4f181e3a0fd68f57a7c0bf6aafc98613 SHA512 d69e3027788b7c58d5f8e9f09c5f717b856e35ad1290ef8afe3a952d4af695d9a12833ee6d85ac97b7d2bf4d90c1f14a81f0027c1dd926327c618a3f5bbccdd2
-EBUILD unison-2.48.4.ebuild 2323 BLAKE2B 5475474bc071741df4c64773a3c7b4cf54b8f7add458e292fd0d5d9b26489133aad898f1458de50adec34a8df23bf2ca351b4e7a29ae91064141f55766520997 SHA512 e2de48ca76e032d7bb4c13fba8c4d99155f23ba9da3ad80f8f90182bb2898634abedc4f4df987bf014ea24bcdfb5440dd836fa650600d311c4a76d4d03a5bafe
-EBUILD unison-2.51.2.ebuild 2146 BLAKE2B 664753004eacd0bb01836b3ecba8646cac1183b32aab412806152f58afd05c76b333a6a9462f422e5418dc044d5a5b4ca53cde6dcdec49ac98b95df98182e580 SHA512 42f8cfcdbd3310c7f016690eccf56df7e109ebad8610737d78b6617a734197ffd2026fd203f19a4e6cb1e6b87b2feb0e2c5f48161c26e3b50dff31838f653364
-MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
+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.51.2.ebuild 2162 BLAKE2B 13c270c67910618a119ecdf9c3779c1175b64ab2bc17de2735413120404a7784ff8de8e8b9e48c3b91bed3b5e7aa0e84370a159ce10b5753c28ddff63e4804da SHA512 847b543b1e83d1036e57c4580103ba4c3c0f31c080c8dea96e3261ad87b06bff0a8269a5f861ec559e9e41f977de5ea9f9825aef62e69bd3f666f1b2aa2fd7bd
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index ffac4d7ebc01..6f49eba8f496 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild
index 01f53f133dfd..3cbf95371a25 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -7,15 +7,19 @@ IUSE="gtk doc static debug threads +ocamlopt test"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
 # of those tests, let's not try to run them (they're re-enabled in subsequent
 # releases).
-RESTRICT="test"
+RESTRICT="test !ocamlopt? ( strip )"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
@@ -25,10 +29,6 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip )"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
 S="${WORKDIR}"/src
 PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch )
 
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index 1cbadbf207ac..fb513a40f2e3 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 
 #PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
 SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
 		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild
index af6cf20473a2..3be608825bf9 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
 S="${WORKDIR}"/src
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
diff --git a/net-misc/valve/Manifest b/net-misc/valve/Manifest
index 850da2d3b5f8..ef444ff9ce05 100644
--- a/net-misc/valve/Manifest
+++ b/net-misc/valve/Manifest
@@ -1,3 +1,3 @@
 DIST valve-1.0.tar.gz 272182 BLAKE2B bc2373569d2f55b5a4d69297b9fb58131bb15fc0d3be538572412267ca642db53e7a337ac44991f4659cb5459ea9f64ca55afee5aaf3e2d64efa871f522b9386 SHA512 116d3c6c400ad523c1c40cf592f56a43e0920ea0b0b2436d8f6185f4664adbc79c30e0cec63ccf922e5998357138a5b50a7e7bb2d9d0b77cbd054d8d1a5ffc12
-EBUILD valve-1.0-r1.ebuild 597 BLAKE2B 11be8729041ca5368342ccaa9f5bddf1687684d3ff5627dc0ec3ea86c157869f48c91e03f67fcff507251fc59f474574c468174f5e2841dee174a0ec5e9ef586 SHA512 83134e37fddf49760f5c085ba928acd35af6348afbefba9803eab3b69613a7fbbd8f6a69277badd8556d915dd7360dad74d9733aa362a7d27d5e5b71e0fea998
+EBUILD valve-1.0-r1.ebuild 621 BLAKE2B 15b84363a9289acba2e2b7526eb066f012b5ac940664a1edfd25c7e293fd5ad55c4ae9caf4b09001b344d0b6863bc0da36946f994595598de57c4ea6e54e166b SHA512 baf88eeffef54d2af38f69090c3a4e5b841480ff82473d6ad2a93bb79523f4bbc2484baf544d0b5ea6ba10776437aa55abd0ffbbd81893b552aab6d5f55a973f
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/valve/valve-1.0-r1.ebuild b/net-misc/valve/valve-1.0-r1.ebuild
index 52f73b5320ce..5510f27b19f5 100644
--- a/net-misc/valve/valve-1.0-r1.ebuild
+++ b/net-misc/valve/valve-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test doc"
+RESTRICT="!test? ( test )"
 
 DOCS=( README INSTALL valve.pdf )
 
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 7be800ef9efa..48502ade8a6c 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,6 +1,6 @@
 AUX vino-return-error-if-X11-is-no-detected.patch 1102 BLAKE2B 145b468e06bfa8b7abb18c1209761a2ca2314ffc92f04fe419ef0722eaed6a30b5a2e8cbeb8923e1b0cf072ba988ea9c3031fe2816df8632c3e123f643c70221 SHA512 6342507c051d81fbcbf8d2f8ce5005b60da0ba6a1f725c3aabb164c310b7c17a92f1aaeedc69873b47ba35041ff5ab7d75b762d5f9bfa70d967864e3cafb2596
 AUX vino-segfaults-on-wayland.patch 1172 BLAKE2B c8e3b9316309f78975123cd3ac87fd53d8fd498be5927a2188dfbddf5ac5316febf71ff5297466e95d079e9dfe8bf4a034c1b45320000c683f5e264527a870dd SHA512 e1d9a489643ce46259ebd830ccd906dbe65675ff57cb2d405b584acbf6c67e3a3f34f051c6ab5bd5fb5d40bd873225b36801b87030c30c0c764d3d5a72095f23
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
-EBUILD vino-3.22.0-r1.ebuild 1823 BLAKE2B d0e21ef4a93b501f56b2c745a05c61cfb243ec7c2c5fd862225600b7645c8e69fe82f35cd52596fa137492377a42de92a66262258e680a1cf1f2c42eea55c943 SHA512 e11cc04c32c09ed6e98f23e9ed8b78f3501662b1a61d8e0f7019ce7fb8818dbbcdc881a968f48d4f1c3aae469b5a9e58ac0269216a1414cd67baf2874cf57528
+EBUILD vino-3.22.0-r1.ebuild 1821 BLAKE2B 14db439bf16ef23f58c0cdfb8b5119e591a3cbca521de229ff7ebe026a05992db296908cd77b52053691984227029e7c78276b5f700b388219b653ffa450e476 SHA512 8d10fcb421ad25ec3aac15b9ed6b4e6f9aa6c54b572ac0fd5d04c30b06100b99d889807fd8f3f5844ae1a68d740042adeeca0a5212e32ad21bc83cae48bae5b8
 EBUILD vino-3.22.0.ebuild 1641 BLAKE2B cb05d5798cb4873e688bbe0e9c11b9648ae19400973599c854a243418aa25cb8381dc7aa761c31a11c4de5b7bf750df5850fbc3c1f8d94f64fdf2b9c035b61ef SHA512 e4f75abf8c4b63f7e7c2856cc6aaf1773fde72464d6f58277a922145676db3f634625c1448479d9ebe0d8fe7d946ceef1d094679dc498ad0368f326ab6e1a883
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/vino-3.22.0-r1.ebuild b/net-misc/vino/vino-3.22.0-r1.ebuild
index 6fe08ad74800..0cc7b6325b92 100644
--- a/net-misc/vino/vino-3.22.0-r1.ebuild
+++ b/net-misc/vino/vino-3.22.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index 87a18e7650c6..bf4ee039f581 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -1,5 +1,5 @@
 AUX vmpsd-1.3-64bit.patch 910 BLAKE2B 1f4fc71e6a0e1f7f0c51938d7e25487ac364054f517bba350ed2805c09059674d706fa7b536ec29a5d5ce836ebf72ffae4342dfdf3e883bb88680f032627b7b0 SHA512 45fc49fe1412760ecb45811c01e86406c4103492c5a29b99d8953dcca388c58ad157b4200a2fb9adaf73488746b8d16b168cad9dc5ae95e1e618de7490fb8b7d
 AUX vmpsd-1.4-snmp-support.patch 2237 BLAKE2B ef6f80dcdd72435d40ff36509c3aa82f71d78312575db02697b7d3dc9c3cceeeee737d8154cbb798deae89a9a24a5070f4d09835fd8d7fa6069f70358f225cc9 SHA512 fd3b9327b07d87d04d9b2f407ceb1e6c1ef64fca0ba63ae040c10e1c46739a487423a3e54fdb228a3210573fbe76faf5a0d4c7f3a4e84eeb80fb74543e42c027
 DIST vmpsd-1.4.tar.gz 92138 BLAKE2B 5fdca60762eb1fca02d95c5022a81b9d28a0266d694dbb40adc1a70e109295ab2f2914f2083f356b372161467df78c35ba28984e6febc4857501e73bd54bb860 SHA512 341a86f8db28f1f7a03b5581ec8f8319a175a2c5dc9c7ff5df880f4416cf048ef9e32afd6600220e48f8713d6c72c4ffae7d1e8d31c73ded466f084711580efd
-EBUILD vmpsd-1.4.ebuild 983 BLAKE2B ce072affbccb655fa1d56a8d13fa87c7ef0347eddb3122e35e83dcb37240985697af7486e8f19c1f4cfe91c161578d2ab6f8c506de5f17d3a86bb44d9bab071c SHA512 8139fa2e06e0d9d24f71dbc1214c93a94e897974377013e4da0ce05e8884530602065ce850f7632edee2344eaa3e32e27e7fb4fc142468d56012d5b0d6103efa
+EBUILD vmpsd-1.4.ebuild 950 BLAKE2B b77a4a09cfef6a3561990d546377f7cb1c6a8c1c95a8b4bc6b7f1c9064be992e1fc43c7d4f973324bdff3ff3479049c00542df2ef01b32b3449883bd027e5a5e SHA512 705c1ad338c8904df7a81f579e2d063f5f761be18ca7dd39cb14dd13d2d75f13af6aa69cf065995cd5ae8d4e9f4883fb35d4b258a5f4a169b85010666a3a6bcc
 MISC metadata.xml 300 BLAKE2B da1056fac1eedc839ac074dce8ba79accd5a592d9c2c4b517e30c80fd977dd899da89b6b8be113f7ceee4ee908b3b1a246f38a698a5d570bc84e898779d8e5e3 SHA512 02b5627182dd5c4adfa3dbcce0c19c4a5d1dce64061cdb2843e133c168c4e8203c8a37a8da80fb04a0c9fb5a3b6b80be2cb6e8453839db39dc5cf3bd0fe51e03
diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild
index 3921400cd694..e2dd42654288 100644
--- a/net-misc/vmpsd/vmpsd-1.4.ebuild
+++ b/net-misc/vmpsd/vmpsd-1.4.ebuild
@@ -28,12 +28,11 @@ src_configure() {
 	econf \
 		--sysconfdir=/etc/vmpsd \
 		--enable-snmp \
-		LIBS="-lssl" \
-		|| die "econf failed"
+		LIBS="-lssl"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc README INSTALL AUTHORS doc/*txt
 	newdoc external/README README.external
 	newdoc tools/README README.tools
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 590a189a93f1..13ff3d579d5a 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 3192 BLAKE2B 6752e9bc4448a2634eaf8674fa524898c348ebe3ce9ea2721be1ff515df79d1c5e8d5a63963d770fdfcce7811aea9e72805203ba80cfef9dbf671b76a1664d34 SHA512 6cc28cf552b46888cbbaad7ae6bb0dbe5fa87b582cad177a940f9cfa6bc15e01d6cdc4c8295a31f0e32b12b4ecb936c22dade35c788a2cd2d02d39d0310b5347
-EBUILD wget-1.20.3-r2.ebuild 3272 BLAKE2B 392499b16500fef79f19252115a807c038ff53f3070a43b7c4bce15a0d0ab9337284d91ddc0b7bffc8b894f035efe3fced5fe16152010eaa61af51580132df4b SHA512 c269c1c139438d6c1bc1bcff2c58c1ce0bdc09c5ac02a6eeeb25d35e4f97d5705260465a9963a030876f1372890ec079a1fa78b41462ac3d65152dc70e4ff4ca
-MISC metadata.xml 656 BLAKE2B 0616f06a26ee8dfa23132a9abf38e1a156da6365b9ac202ff1a0985c0f19b1965f156c68fea81958fb86d3282aa1b6732087060c781bfcc500efeb8bffcb5098 SHA512 9d0acbcaccf5107a6b98e460cd6dd848b2e1f4f7bae5963a65e36919ed062563854a5f4315bd1f0903f6fb7b37d7fc58bc63c05efdadbc5644f6916c8858d068
+EBUILD wget-1.20.3-r1.ebuild 3219 BLAKE2B ed62068ae8d769c614ddd05ae6904bf02b94eb0e6783ce03e6bd70199ea3ca0a3139dc4cdd2840a1e314950499db00398c09b01f9f3d8e77f28352618b78859a SHA512 ea9506291f2c2ee7964bae9d716862334b2cf3eff5b80dc1410ea4d8a90e809daaa6cb04b3c7990986048f0205858cddc0ccab017998a7d94f8f1a7e6e3a98e8
+EBUILD wget-1.20.3-r3.ebuild 3369 BLAKE2B 1067e0773119113426771b55d68664749fbc6cdc0df105656d8ed1f29dd22ee79dbf67176b7c76e4a8fcf86dd93ad84e591b821c8ab47586382ae095df331d2e SHA512 6c8b38e33a902b837419ac3fe4c190b09c5d5f855b74d7a739883b9f9d3be0404ac8112847dbb43c5043e94038b312df3c5cf16625c5da64550ff039c16d7ae1
+MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index d0383b4091d2..bcdf4d308b75 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -7,6 +7,7 @@
  </maintainer>
 <use>
  <flag name="cookie_check">Enable cookie checks via <pkg>net-libs/libpsl</pkg></flag>
+ <flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
  <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
  <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
 </use>
diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild
index 36f1872b43b8..7d72a792dcb9 100644
--- a/net-misc/wget/wget-1.20.3-r1.ebuild
+++ b/net-misc/wget/wget-1.20.3-r1.ebuild
@@ -16,6 +16,7 @@ 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="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+RESTRICT="!test? ( test )"
 
 # Force a newer libidn2 to avoid libunistring deps. #612498
 LIB_DEPEND="
diff --git a/net-misc/wget/wget-1.20.3-r2.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 2d73864ac716..9b186d6be020 100644
--- a/net-misc/wget/wget-1.20.3-r2.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -14,13 +14,15 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 LICENSE="GPL-3"
 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="cookie_check debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+RESTRICT="!test? ( test )"
 
 # Force a newer libidn2 to avoid libunistring deps. #612498
 LIB_DEPEND="
 	cookie_check? ( net-libs/libpsl )
 	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	metalink? ( media-libs/libmetalink )
 	pcre? ( dev-libs/libpcre2[static-libs(+)] )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
@@ -102,6 +104,7 @@ src_configure() {
 		$(use_enable ssl opie)
 		$(use_with cookie_check libpsl)
 		$(use_with idn libidn)
+		$(use_with metalink)
 		$(use_with ssl ssl $(usex gnutls gnutls openssl))
 		$(use_with uuid libuuid)
 		$(use_with zlib)
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 6baf7e4629a1..8d8a4a6264c6 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -2,7 +2,9 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4
 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.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-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.5.3.ebuild b/net-misc/whois/whois-5.5.3.ebuild
new file mode 100644
index 000000000000..c05c758875ac
--- /dev/null
+++ b/net-misc/whois/whois-5.5.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	#SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	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
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index d5b0823a6c57..9a806137064b 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,3 @@
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r1.ebuild 391 BLAKE2B b52ef1bcb4732b58edd4a0c6bc8d8de51eff4238e9714d9df05d1e38c3d97fffdb057c805278bf48568bf2a5665e6c848daf900800054e7a475b8cc3f3ab5a53 SHA512 afd52d0860c638bf12f4a659598f61b504d0cb0a3d59e3346dc53f70ce1ae8e5c1c0222eb5a07bbe94b9d5c94895a3e00126f375ab2ef17db64241e735a81959
-EBUILD wol-0.7.1-r2.ebuild 470 BLAKE2B a08ce1d19e18344da85e7beba9651bdd670688d6183b092e9542a1cb46010c106b41b2ea10d0cf38040788e12a94d62ffb68485cc765efb8beea395fcec4e33c SHA512 666796af7b0d8647293c97823ea423086c673193a5c075175840cd078c89696e0eb2638e48df1a84d13d533fcb1b305f1e453e8f023b8c81acd2ea1895707211
-MISC metadata.xml 735 BLAKE2B 6c3b6199ccb776a5ad5b817d70e72da0416207f98fd3b7bcf082f98088e592535da06571fe4f77c82d40b456e55271f3084ccff2f64e4c5cd610c31cd24c44e8 SHA512 0cff2c4127942f5dc455beeb78c63a271451a7ae38e03e53dace85c64353fc9214e803f67d39996289096b19e60ec2ae5ff3a4be61dd7a2570d9c9864182fcb7
+EBUILD wol-0.7.1-r2.ebuild 469 BLAKE2B 3dbde4bf661bd025c221c88bbe1a6708472a616c257625ff108516322c00a33521e4bada1041fb9e1c27038956a89ed66e41495116b7737d344627dc1ede0e66 SHA512 660229ad565faed71bc2142bfa5b78bf2053b399fd7883ce3e26c274b7ea66bf206b9dea2719ac7af05f73c96990972db21443e72cb63394f641a1d4e27d4d41
+MISC metadata.xml 616 BLAKE2B 5beea9884b74086c02e1cf37e08157dee574c98c56f06371e96132a31747be644761601429ff79211eec98004dd468b5e51e7a71c480b0d6e3e43d3e5941dfa3 SHA512 ba5865dcd92e68b01a21d126aadb530d936639bb391b959c683e83daefcc671201b772a713fc0a6397eb892558c8e9691700ee97955b3992fd64ecf1cdc9c240
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
index b00b64532dec..2dae3faec7c8 100644
--- a/net-misc/wol/metadata.xml
+++ b/net-misc/wol/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This is wol, the Wake On Lan client.
 		It wakes up magic packet compliant machines such as boxes
diff --git a/net-misc/wol/wol-0.7.1-r1.ebuild b/net-misc/wol/wol-0.7.1-r1.ebuild
deleted file mode 100644
index ddb2e8ea3fd3..000000000000
--- a/net-misc/wol/wol-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Wake up hardware that is Magic Packet compliant"
-HOMEPAGE="http://ahh.sourceforge.net/wol/"
-SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
-IUSE="nls"
-
-src_configure() {
-	econf \
-		$(use_enable nls)
-}
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index f9ecc3aff5d2..27e01462efda 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="nls"
 
 src_configure() {
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index a0b3ae6fb859..e1c600cbf931 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -4,6 +4,6 @@ AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
 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 2728 BLAKE2B 3588849df0416e14f25cfeb273300ea56cc3b091bb1d641963329b41384dd4826e597ad754fc038ae365ed8b75dc57cec5571f044ea5aeab772c186dea39b3af SHA512 95d702ef53a4d8f3fb96677e87b1ba42b3204d7e3a279291f6bdc6311ba4288e2151dd41fea5c5f56589005ca439600cbcfcf8ae0549bb3e3691f1d8ad52b655
-EBUILD x2goserver-4.1.0.3.ebuild 2825 BLAKE2B adb48cc6d5717c764b240886ea60469aa581b2f2940be2f0952abdabf1f546e2599c37e51470e574631cbec1c1214d4b5b1bd513d4fb1e74dd7657b1e1f6cf0f SHA512 5ac97bc44c976bccb980032e15bdd4fe300eb7ea4fe5e0275e49212d7c756cbdeab34f6bfb5c291cf7ea8d499d3ba6823d039e709fcbd4dcf5bbf955ae54497f
+EBUILD x2goserver-4.1.0.2.ebuild 2603 BLAKE2B 6d7c418547ce8ebeb4c226e1e90d18d329bfd679c8fe6c09d6fa967e0ffeb89d04257154e192d3e7a8585443ad8818730e0a490074ba9e0b4bf05bee50df53df SHA512 2b918aa2920ce522d89657cd297a9dc40e6cff579cd700d338c9957c23cf9ca57855a8b6fd806054905a4636bd27591afa5348787dd568e02c68e5a298c6917e
+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.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
index 62fa686aadcd..63bc43289678 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit multilib systemd toolchain-funcs user xdg-utils
+inherit multilib systemd toolchain-funcs user xdg
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
@@ -81,6 +81,7 @@ src_install() {
 }
 
 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:"
@@ -99,12 +100,4 @@ pkg_postinst() {
 	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"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
 }
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
index 710f925aa268..01bc3f6c2225 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib systemd toolchain-funcs user xdg-utils
+inherit multilib systemd toolchain-funcs user xdg
 
 DESCRIPTION="The X2Go server"
 HOMEPAGE="http://www.x2go.org"
@@ -84,6 +84,7 @@ src_install() {
 }
 
 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:"
@@ -102,12 +103,4 @@ pkg_postinst() {
 	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"
-
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
 }
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 324f9981d557..7aeb29883a87 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,4 @@
-DIST youtube-dl-2019.11.05.tar.gz 3159084 BLAKE2B 9db643c3f3fafa0ee0b35b24afa411a169fe91f4dc2dd756ce1d3ce4b0db32cb483bca9cafdde6395232f38d5bafe90cca065fe7c1359f35d26e75dfecdb8bc3 SHA512 ec6d42e61d01e7f4087e980953c47facbbc9c5722d40f6c066789b940e084042fdc9a00266c13822a671137adf7f528fd7eb31a7849337e2e7418a722d9f865f
-EBUILD youtube-dl-2019.11.05.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+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
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.11.05.ebuild b/net-misc/youtube-dl/youtube-dl-2019.11.28.ebuild
index 8b7913f66a7d..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.11.05.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.11.28.ebuild