gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /net-misc
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
130 files changed, 2316 insertions, 2390 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e42e8805925d..dace7512d9ba 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index eec5e9ac651b..513f443c1c3f 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -5,6 +5,12 @@ DIST anydesk-5.5.0-amd64.tar.gz 4649329 BLAKE2B 13e3365990ec521e430e52c0e2e3a58e
 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
+DIST anydesk-5.5.4-amd64.tar.gz 4886562 BLAKE2B f8a754de375db95ae5af728e0433cd25594a7d9ca03f0a2f133a661ca8b8ae70979ed209f224cffc71c7cc7d3a52566d6d0686bf1fa758563855695d6a92c6ab SHA512 dd9d78dbdb07930027d1222d715bae678c8933940289f2466c0a3600602e616365228ebd074bfb12ae07c9b30f44f038b4fe07374eea743784c320d3bb8d1d61
+DIST anydesk-5.5.4-i386.tar.gz 4796401 BLAKE2B 35b89fcbc1565a548e3631fbd476bb5516405a62db537d1b5b76a18d3a4e912fe2be7fb92a451d1dcd11c3d16be5e012b53842a40811687320e4d806d0723509 SHA512 d6d14eed83c5b48fb02bbfe25b12c7875d984ab27ef713645aab4a4f63f5a54253da63133699a559ef4b827c9f56b3055efe0e08a4c31334247928f21c5539db
+DIST anydesk-5.5.6-amd64.tar.gz 5054062 BLAKE2B a131fe5e10def7017cf29e8cc175e2b448be7fe3e9fa7257dc0cb470f31f6fdc78e510b5e377bc10528f0eb7f264572bf4c334c9d412f8f7404aaf85d4babbb9 SHA512 32527532fb769dccc6df8208c18e391ac6537e38f7d6c5acfd3280dbbc7cf0c545ec55416eb798ad8a6d3b0e958778d87696c9d721dd1739c17b935f1046c29d
+DIST anydesk-5.5.6-i386.tar.gz 4970197 BLAKE2B b656071498784052ce1c81f32c0ae333039930b26487d204dc5f55e8352f263878437ab3a4e2ac8469745ece75a29056f553f12f33fe96c9c2bc54d3d4644941 SHA512 3b561e014cc4c149f4d77b43c4e5427266604679dfdf9253bb76689ee6c6ac5b274cc5ac58147bdc136c20f616c9f9d8dbc2c11b5b85d0f184a0251ece2ad265
 EBUILD anydesk-5.5.0-r1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b7a020ee426e2ae1aa605bf786575b6efc1c86c7747e5b8e3cf9cd774001c29b4d4142e4a358c8b85806dffb41 SHA512 bf68271d34c56804b63226d80784bd1b1fb9f4bd6f3a6c25722912e472be04c1272233f64a361d7f53194c16b8df4c3e16468e72ffe7e77623989f6144b0d116
 EBUILD anydesk-5.5.1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147f9b7a020ee426e2ae1aa605bf786575b6efc1c86c7747e5b8e3cf9cd774001c29b4d4142e4a358c8b85806dffb41 SHA512 bf68271d34c56804b63226d80784bd1b1fb9f4bd6f3a6c25722912e472be04c1272233f64a361d7f53194c16b8df4c3e16468e72ffe7e77623989f6144b0d116
+EBUILD anydesk-5.5.4.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
+EBUILD anydesk-5.5.6.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
 MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-5.5.4.ebuild b/net-misc/anydesk/anydesk-5.5.4.ebuild
new file mode 100644
index 000000000000..6b1d45ed0538
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.5.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 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/anydesk/anydesk-5.5.6.ebuild b/net-misc/anydesk/anydesk-5.5.6.ebuild
new file mode 100644
index 000000000000..6b1d45ed0538
--- /dev/null
+++ b/net-misc/anydesk/anydesk-5.5.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 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 fa3d6ba6f9b6..c4a09a5d78c1 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,4 +1,5 @@
 AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb
+AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16
 AUX apt-cacher-ng-9999999-flags.patch 660 BLAKE2B 64c1e8ef41841daf8e13b1cc9a0a2fe8839200eb37663069c52e1a2e2ae1f454ed98d802b7dfa6df95c9f3f113badfbf6bc07f3e9aa9b8925e88c87c8a3af9ee SHA512 fb3332380708ec37179de9493193e8c674e38fbd38af00098572fbe1b66184e5c3358640a8f56d8e336582b496e3d0d924761a3dffdc397e98903beb90efa8de
 AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
@@ -12,6 +13,6 @@ DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b349
 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
 EBUILD apt-cacher-ng-3.3.1_p2.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
 EBUILD apt-cacher-ng-3.4_p1.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
-EBUILD apt-cacher-ng-3.5_p1.ebuild 3008 BLAKE2B 8c3d1f980c2feb4f9e66987bf31a2b3160b2e6cc01c1a679192575b1c4d2cc8e4b4fc3cb07dc4535a5fbb3252ac6311720b6197b8df4aee0e1b4416f697a691f SHA512 de16ae9ad3f8bcd68e672d8bec28e7cc57df6920e12aa1e21ebbe4ec85d8afbf4dd964e3d0c6e740df1b8dec5cf9e93d7a84f073ecc60108b034d81af9b8aedc
-EBUILD apt-cacher-ng-9999999.ebuild 2787 BLAKE2B 47f4c6f7657f1651fe41be6787320ddb746ba7427644c7fa5f3f363dc69dee49f610290ad4d5b472e79a3e4a79c682f0c7cb7c2f1dae56421abcf9d6ab4918d1 SHA512 b0c096658bedcb31ad27d5719c6bf4ab2e8196647b124d9fa746670255c1f4fc7d569905d334be2b395b2d03c3f1e96a3187daaf0c3e411d4b4570a579946a21
+EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 3051 BLAKE2B b491d278e3b6353d07e3f626a43f54f030921ee2782680e74b3c375a7fb55a96c16ae6b40678d3571a4c01baee5d7a00ad3ae4697c466848310d5b70a1b8e088 SHA512 04f2f4c75b0a8977f171dc3b27e974678d9218c7423b2cfa51139576a0a8a6c9713aeeaa62aa94daac320a615e9ef9d9f8d10086d30cd1fe498841c45d0568e8
+EBUILD apt-cacher-ng-9999999.ebuild 2830 BLAKE2B b8f25d69a78c7c2833ab73fb0cc18a13336af60747e276c2c0348659bb918f594726979184797312343fa3e4feb3582e23699198712b1ed76648b8f3a83ada79 SHA512 dece416e0eff684007f95d758377f9310ec03962111544c003375d552aa0cfde0fcfccebd208a763820a668c6e09fc844e39df67106260fdf7642b1831e06724
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
index 4061fff1f9ca..f118d28f0119 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.5_p1-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.1-flags.patch
+	"${FILESDIR}"/${PN}-3.5-perl-syntax.patch
 	"${WORKDIR}"/debian/patches/debian-changes
 )
 S=${WORKDIR}/${P/_*}
@@ -121,8 +122,8 @@ src_install() {
 
 	# perl daily cron script
 	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
+	insinto /etc/cron.daily
+	newins "${FILESDIR}"/cron.daily ${PN}
 
 	# default configuration
 	insinto /etc/${PN}
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 402b95991acf..6ae025935bf9 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-perl-syntax.patch
 	"${FILESDIR}"/${PN}-9999999-flags.patch
 )
 S=${WORKDIR}/${P/_*}
@@ -113,8 +114,8 @@ src_install() {
 
 	# perl daily cron script
 	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
+	insinto /etc/cron.daily
+	newins "${FILESDIR}"/cron.daily ${PN}
 
 	# default configuration
 	insinto /etc/${PN}
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
new file mode 100644
index 000000000000..32421a07eefc
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.5-perl-syntax.patch
@@ -0,0 +1,11 @@
+--- a/scripts/expire-caller.pl
++++ b/scripts/expire-caller.pl
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ #
+ 
+-print STDERR "WARNING: this script is considered deprecated. It may still work but could print incorrect results!\n"
++print STDERR "WARNING: this script is considered deprecated. It may still work but could print incorrect results!\n";
+ 
+ use strict;
+ use Socket;
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 88419769b00a..bdb31e207053 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -9,28 +9,18 @@ AUX 1.8.0/asterisk.initd7 9261 BLAKE2B a0b3740b9d4352bff9489b74aef60847eacb1f2b3
 AUX 1.8.0/asterisk.initd8 9784 BLAKE2B 84558128572f9c3ca3331eda48728613e23ec7d5ebe5a1ef930a1ab125f1e1f2457a13231308506612e98b6c530c7a0d007bb8b673560ee77d078de5fc341d61 SHA512 eb0f316a2fbfbc228a605118b03e213653b94ab1400e50248bd2de5ce436eab9318d486d1c46d7ee8e83c71161d6106605b38bc01d5d4b461f91962749e41ee3
 AUX 1.8.0/find_call_ids.sh 1078 BLAKE2B b480ec9f61453081735e0a1e5176a6de3e6ecc58ec8035b439bd95d64f9e1a5d02fe9810db4ba2e8d20632f186dd91d17c6cdd17a307ddd7802e8aea4638abbc SHA512 1690eb3ea9eb51711df9fd7c121dbc520a2a15870fa06523f096968386ca68a132a46e361b9d19367c7089cd9ad18132ed02ef0aedd990d5939550182a3366c9
 AUX 1.8.0/find_call_sip_trace.sh 1115 BLAKE2B d9f5cc559f3dd3fbbb9c50a2b6e6ad30c94521774d3774023d0fd4f51d74b8109b4c9d3eea92c7872532012cabbe892d49aa5261aa4a64b324dff5b679820851 SHA512 e679f3953b2e397d7c80bb2f0ca3db848f07ba97ca139c87224de4467f8172034eb4372e5ddd68116774a7b9d5fd48aa30d809e2af2c6e6e0747762c69090b6a
-AUX asterisk-13.32.0-binutils-2.34.patch 573 BLAKE2B a92202c4d07f11b59f68b5b32f8c2240c81d599b0ade14f4a70281bd1bf8b6885e021679bdaf3d5b3594076c15e37be67fa657cbb280a82d437b6064b8ae3243 SHA512 fe54d844aaa1ba5c62199330905bbe614322742b86f93d627c0572093ce1c119cbc88fc96165a1a856c4b4d2f2f56a128951d854777d89e04475f30efa648df7
-AUX asterisk-historic-dahdiras-without-root.patch 668 BLAKE2B 020298676b0e7e195c2c4fc73463a9517263bd4f2b695206609b032f4cd476f8c990dda5dd5157e45012674fc27034d44097259bc96029cb66a1e83ae3b9795d SHA512 11e660c28a5b293719df70488ca656f171a080afb7fde3acb20bbf7e9f250de92391ab3a6e5d2a1ddd0e9551c52cca3a5ef8371b306ce260943c273a3ab6a22e
-AUX asterisk-historic-dundi-null-dereference.patch 1196 BLAKE2B fe3fa097328ca1b4205025ba9a749045490c4aba2cf8242ef755ab359d422d4edddc306b9af61d215800a65d5f4010a37d987b944729a9f5bf45b811ccb61f58 SHA512 c117e999e1ab731dda27da5238b863e3fc1ef0252ba6b20e4651a10c245cb935baa2f150fcd92fc1482ee87f2579b61c6dd5a7992df7ffe6624b60f2d26bb365
-AUX asterisk-historic-invert-gmine-search-order.patch 415 BLAKE2B ff5ed07584ac2fa05792e690900ac207edf61b74fda7515e78783daae31a662484067750c580ca3efcb410cca5b5e6f2af3c8225a62c17194a53dfe0456ffa56 SHA512 a93f25bec0c3564442a95f0ab1904c848bf7f8e08b51a626539d93e6a712ba5f01e1fce7f5e2ce676b28f13d618443afc1a05e0697d8ee1af7617ce52e5b2efb
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
-AUX asterisk-historic-uclibc.patch 734 BLAKE2B 0d1e7bef3b641de0cdf3ba3e146fce63a507860fe8842e15b38937326e1881dd6498ddc89b6d96825132fac52f951cd2508c7b8614c93bd11017b327589015e0 SHA512 ff3872d1e77b609dcbbce702fa000d3431c4592ee41efd959887e0d38c39f93196422c1a1e0d22a7839fe92a68c2a13da81b7f70310863713772c59e5c2cc08a
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
-AUX initd-13.32.0 10546 BLAKE2B 857c44b74a411ab4ef5b9ffafb566f8f81949b40c685807db26d59d8b7233a06c3c55425151937c11f8e1c2d7f72f64674d77cef2bca8b28c5d608d9816905ab SHA512 f22e789bd33576ebb149fb07a623397aeccc2280b6c55ee762f2c95d3622a25d208a06078faf2fefaf0d984a24c00b60eb82da2ae084abb3e3efd90ffa5351a9
 AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec4428bdaa93e1354b660dfb76b5969b5811add3b092302dcba3fbbdfdcd849cacb1f05fe645af9d73d359 SHA512 556fe37a67994989642b609443d94f990b23fd0cf037268b1ef9f66a9fdd93a79cb7f2e9ee10c069936b41b7f361abbb72836b1da759e646733e2f7c14d3195b
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
-DIST asterisk-13.32.0.tar.gz 33652378 BLAKE2B c6b0ca0895b25526c135332966f33761b74a88dec4a7b0ff0fe40263640ee2fb928eca29e716fba3cc8e96c6e395e7c70c36f41def6a0d055baac2a5c7b8637a SHA512 daafcd5d3544725e7a96bd467d998c4d74fd3c5d7e9d8fb4ce16e340ce09c502b1603e468e89c5a62b59282848b4ff0a43bdbcd75902cd11f6951d828511e841
 DIST asterisk-13.33.0.tar.gz 33683712 BLAKE2B ecfc122628c08e93fc389f111e1ee8ddcf3d27895437df9da5b83a6440c2135f9223a5605e0ef436e8585f8b023abba5b74680cac97f1700e1bc153872c1ed87 SHA512 b866a63cce7c289d32333b4b3b0a605c413b48fc7518976aa0768dd5c68894348d0de1c9bc7c56b73eb86b69e0fd9847d7226fa0f9e449f8ebb8a7118329db56
 DIST asterisk-16.10.0.tar.gz 27706766 BLAKE2B b8d7866fe3e8420ef5ce6ea5e016316f63e4f2e8904a79de69c4ddfb7aedcd00f09cfb414da43938af0771cdde387dcebfe716eb34e5ed1de3a30ff534459c7f SHA512 254c582593cf6ec691649d995a8d73260d2e340ad6ae65f0af62f6b8c3ef59c4da6ad9172bc04cc29a907d1e8d2ef105ae2ae20190b30115d5d402423c8c08cb
-DIST asterisk-16.9.0.tar.gz 27674324 BLAKE2B 991fb0146f5dea338a8c6ad98007e2ac1b182ac2ed7dbabd4143aa7f968dc353563ac4aba18bb07e9b0a705dabd1446319b06f4be284922a804d5c2dbddf6f7b SHA512 b8101fa3cc6068230b6b9a28a558415e7104b9bc3a8c0c245af34e9839cf1eb287739a2142ad0227d2fef41e6d40a5c01128a0b44a7ecaae13a00767d0fa8ab9
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 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.32.0-r1.ebuild 9796 BLAKE2B 642d4b5a94e3a835e0b82e91717db6f0080a2d119500679bbd106828c6bec1b249e2fc7364bc019256e768dd7e991ea948f92f97b564add03b1511519a762e03 SHA512 445e85c57e6806a6224ffcb03c8e933f198f95ddd5991313afc2af3de24e669bd75a27ee061968229628394b2daf0f0416cb4889f6595e94f9f9a6f569ff377c
 EBUILD asterisk-13.33.0.ebuild 9173 BLAKE2B df9b4d5b2add191db0ea42765ae8f52a2b246761d689b1c8f7191f02475e0dfabe07b6ee318eb8ada7f83a47cf8e928dca46de5d4b898eb5388be89aff5db770 SHA512 461eb01828e69a9e294b0892a2bd01219ae39d51e80567dfbd38e50933f5fe40112c2aba05dc9ce14cad9f511fee92d692966411b032cb0a13d0672566eb6994
 EBUILD asterisk-16.10.0.ebuild 9313 BLAKE2B aa08c101a2531afe02059616da7cc4e621124f86ccbcada647d1f2acdde12bdc80d2abe69a391c06d20ad26416cd3c20187e326ad9689750273b9167bdacd702 SHA512 5d851d212b4edc89addbed9058b4108c5a49e1859bc10bdeb9341b39ed0b6563da335a29c427d95d7609429aeb4beece6c16af1592c0b4026879ca7c9e101715
-EBUILD asterisk-16.9.0.ebuild 9852 BLAKE2B db97375b52ca0d9cae392252e76af9270197c21c986bca673d8c815bf6c38affb1b3fa2c4d5e24d3822097db82d6e2fc661a67a349857c711a74d29f57914f0f SHA512 24f4f001a4c6c683eba65e7cb21678d612995ca6f48d6484a09d43d853209020de4f582cceae86237cf4ad5ea5130baec54161b278faf70fdd873e62d94af5ef
 MISC metadata.xml 1391 BLAKE2B dfa59edbb0e1e073171b7b335bec7c8188af06e97a88674c4a4f516fc42e4754044c8430af549865ff6bb18eb1dc969dbfa3b3868cc7b8964150581d200d946c SHA512 1dce9bbe1879a7a93ec9ca99a618722753251625626f15fcf9efbf9aa781f93084ea0f68857eeeb41664d82bdb2922ce75649c8627dbd9b46e42a7e825e3b3b2
diff --git a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild b/net-misc/asterisk/asterisk-13.32.0-r1.ebuild
deleted file mode 100644
index 49dc718b5c0c..000000000000
--- a/net-misc/asterisk/asterisk-13.32.0-r1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2020 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=(
-	"${FILESDIR}/asterisk-historic-uclibc.patch"
-	"${FILESDIR}/asterisk-historic-dahdiras-without-root.patch"
-	"${FILESDIR}/asterisk-historic-invert-gmine-search-order.patch"
-	"${FILESDIR}/asterisk-historic-dundi-null-dereference.patch"
-	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-13.32.0-binutils-2.34.patch"
-)
-
-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="${ED}" 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}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-		for conffile in "${ED}/etc/asterisk/"*
-		do
-			fowners root:root "${conffile#${ED}}"
-			fperms 0644 "${conffile#${ED}}"
-		done
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 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/asterisk-16.9.0.ebuild b/net-misc/asterisk/asterisk-16.9.0.ebuild
deleted file mode 100644
index b7d72507ad54..000000000000
--- a/net-misc/asterisk/asterisk-16.9.0.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${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 libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/asterisk-historic-uclibc.patch"
-	"${FILESDIR}/asterisk-historic-dahdiras-without-root.patch"
-	"${FILESDIR}/asterisk-historic-invert-gmine-search-order.patch"
-	"${FILESDIR}/asterisk-historic-dundi-null-dereference.patch"
-	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
-	"${FILESDIR}/asterisk-13.32.0-binutils-2.34.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	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 )
-	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-2.9 )
-	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= )
-	)
-	unbound? ( net-dns/unbound )
-	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"
-
-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 \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	# 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 NOISY_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="${ED}" 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}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-		for conffile in "${ED}/etc/asterisk/"*
-		do
-			fowners root:root "${conffile#${ED}}"
-			fperms 0644 "${conffile#${ED}}"
-		done
-	fi
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 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() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch b/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
deleted file mode 100644
index 6ce797ca4f2d..000000000000
--- a/net-misc/asterisk/files/asterisk-13.32.0-binutils-2.34.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main/backtrace.c	2020-03-12 07:37:03.000000000 -0700
-+++ b/main/backtrace.c	2020-03-31 23:22:18.272691980 -0700
-@@ -64,6 +64,15 @@
- #if defined(HAVE_DLADDR) && defined(HAVE_BFD) && defined(BETTER_BACKTRACES)
- #include <dlfcn.h>
- #include <bfd.h>
-+#ifndef bfd_get_section_size
-+#define bfd_get_section_size(x) bfd_section_size(x)
-+#endif
-+#ifndef bfd_get_section_vma
-+#define bfd_get_section_vma(x, y)	bfd_section_vma(y)
-+#endif
-+#ifndef bfd_get_section_flags
-+#define bfd_get_section_flags(bfd, ptr) ((void) bfd, (ptr)->flags)
-+#endif
- #endif
- 
- #include <pthread.h>
diff --git a/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch b/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch
deleted file mode 100644
index 1fdf033b7224..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-dahdiras-without-root.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Gentoo bug 337297
-Link: http://bugs.gentoo.org/show_bug.cgi?id=337297
-Patch-By: Jaco Kroon
-Committed-Date: 2010-09-16
-Ebuild-Version: 1.6.2.13-r1
-
-Upstream bug 17991
-Link: https://issues.asterisk.org/view.php?id=17991
-Patch-By: Jaco Kroon
-Committed-Date: none
-
-diff -uNr asterisk-1.8.0.ORIG/apps/app_dahdiras.c asterisk-1.8.0/apps/app_dahdiras.c
---- asterisk-1.8.0.ORIG/apps/app_dahdiras.c	2010-10-27 00:41:40.000000000 +0100
-+++ asterisk-1.8.0/apps/app_dahdiras.c	2010-10-27 00:50:00.000000000 +0100
-@@ -119,8 +119,6 @@
- 		c = strsep(&stringp, ",");
- 	}
- 
--	argv[argc++] = "plugin";
--	argv[argc++] = "dahdi.so";
- 	argv[argc++] = "stdin";
- 
- 	/* Finally launch PPP */
diff --git a/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch b/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch
deleted file mode 100644
index 8fb531937989..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-dundi-null-dereference.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream issue 21205
-Link: https://issues.asterisk.org/jira/browse/ASTERISK-21205
-
-Submitted upstream:   2013-03-05 07:06
-For Asterisk version: 11.2.1
-Patch by: Jaco Kroon
-
-If a negative (error) return is received from dundi_lookup_internal, this is not handled 
-correctly when assigning the result to the buffer. As such, use a signed integer in the 
-assignment and do a proper comparison.
-
---- a/pbx/pbx_dundi.c	2013-03-05 15:07:00.523387892 +0200
-+++ b/pbx/pbx_dundi.c	2013-03-05 15:18:49.512625981 +0200
-@@ -4123,7 +4123,7 @@
- 
- struct dundi_result_datastore {
- 	struct dundi_result results[MAX_RESULTS];
--	unsigned int num_results;
-+	int num_results;
- 	unsigned int id;
- };
- 
-@@ -4255,7 +4255,7 @@
- 	drds = datastore->data;
- 
- 	if (!strcasecmp(args.resultnum, "getnum")) {
--		snprintf(buf, len, "%u", drds->num_results);
-+		snprintf(buf, len, "%u", drds->num_results < 0 ? 0 : drds->num_results);
- 		res = 0;
- 		goto finish;
- 	}
-@@ -4266,7 +4266,7 @@
- 		goto finish;
- 	}
- 
--	if (num && num <= drds->num_results) {
-+	if (num && drds->num_results > 0 && num <= drds->num_results) {
- 		snprintf(buf, len, "%s/%s", drds->results[num - 1].tech, drds->results[num - 1].dest);
- 		res = 0;
- 	} else
diff --git a/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch b/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch
deleted file mode 100644
index 99e76d947fb2..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-invert-gmine-search-order.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr asterisk-13.18.2.ORIG/configure.ac asterisk-13.18.2/configure.ac
---- asterisk-13.18.2.ORIG/configure.ac	2017-11-14 11:26:06.179850146 +0000
-+++ asterisk-13.18.2/configure.ac	2017-11-14 11:27:46.256844611 +0000
-@@ -2503,7 +2503,7 @@
-     fi
- fi
- 
--for ver in 2.0 2.2 2.4 2.6 3.0; do
-+for ver in 3.0 2.6 2.4 2.2 2.0; do
- 	AST_PKG_CONFIG_CHECK([GMIME], gmime-$ver)
- 	if test "$PBX_GMIME" = 1; then
- 		break;
diff --git a/net-misc/asterisk/files/asterisk-historic-uclibc.patch b/net-misc/asterisk/files/asterisk-historic-uclibc.patch
deleted file mode 100644
index 167ae080b193..000000000000
--- a/net-misc/asterisk/files/asterisk-historic-uclibc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Gentoo bug 66557
-Link: http://bugs.gentoo.org/show_bug.cgi?id=66557
-Patch-By: REdOG
-
-Submitted upstream: No
-
-The uclibc environment, as opposed to the glibc environment, needs explicit 
-linking with the pthread & dl libraries. Without these, name resolution is 
-not functional.
-
---- asterisk-1.8.7.0-rc2.orig/Makefile	2011-08-25 21:00:55.000000000 +0200
-+++ asterisk-1.8.7.0-rc2.orig/Makefile	2011-09-21 14:13:12.823076046 +0200
-@@ -247,6 +247,10 @@ 
-   _ASTCFLAGS+=-pthread -ftrampolines
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  AST_LIBS+=-lpthread -ldl
-+endif
-+
- ifeq ($(OSARCH),SunOS)
-   _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
- endif
diff --git a/net-misc/asterisk/files/initd-13.32.0 b/net-misc/asterisk/files/initd-13.32.0
deleted file mode 100644
index 6d1f77e51b9b..000000000000
--- a/net-misc/asterisk/files/initd-13.32.0
+++ /dev/null
@@ -1,380 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="forcestop reload"
-extra_commands="checkperms"
-
-depend() {
-	need net
-	use nscd dns dahdi mysql postgresql slapd capi
-}
-
-is_running() {
-	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
-	PID="$(cat "${ast_rundir}/asterisk.pid")"
-	[ -d "/proc/${PID}" ] || return 1
-	EXE="$(readlink -f /proc/${PID}/exe)"
-	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
-	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
-
-	# PID reported in pidfile is active, and is still an asterisk instance.
-	return 0
-}
-
-# Sets up a few variables for us for use
-# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
-# ast_rundir: directory to be used as run folder (pid and ctl files).
-# ast_spooldir: 
-setup_svc_variables()
-{
-	local t
-
-	ast_instancename=asterisk
-	ast_rundir=/var/run/${RC_SVCNAME}
-	ast_logdir=/var/log/${RC_SVCNAME}
-	ast_spooldir=/var/spool/${RC_SVCNAME}
-	ast_confdir=/etc/${RC_SVCNAME/.//}
-	ast_stop_timeout=120
-	ast_stop_method="gracefully"
-
-	if [ "${RC_SVCNAME}" != "asterisk" ]; then
-		t="${RC_SVCNAME#asterisk.}"
-		if [ "${RC_SVCNAME}" = "${t}" ]; then
-			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
-			return 1
-		fi
-		ast_instancename+="(${t})"
-	fi
-
-	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
-	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
-	[ -n "${ASTERISK_SPOOLDIR}" ] && ast_spooldir="${ASTERISK_SPOOLDIR}"
-	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
-	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
-	case "${ASTERISK_STOP_METHOD}" in
-		grasefully|when\ convenient|now)
-			ast_stop_method="${ASTERISK_STOP_METHOD}"
-		;;
-	esac
-	ast_group=
-	if [ -n "${ASTERISK_USER}" ]; then
-		ast_user="${ASTERISK_USER%%:*}"
-		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
-			ast_group="${ASTERISK_USER#*:}"
-			ast_group="${ast_group%%:*}"
-		fi
-	fi
-
-	[ -z "${ast_user}" ] && ast_user=asterisk
-
-	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
-
-	return 0
-}
-
-checkperms() {
-	setup_svc_variables
-
-	local path
-	checkpath -d -m 0755 -o ${ast_user}:${ast_group:-${ast_pgroup}} "${ast_logdir}" "${ast_rundir}" "${ast_spooldir}"
-	for path in "${ast_rundir}" "${ast_spooldir}" "${ast_logdir}"; do
-		ebegin "Checking ${path}"
-		find "${path}" ! -user "${ast_user}" | while read element; do
-			[[ "${element}" = *.gz ]] && continue # Skip logrotated files.
-			ewarn "${ast_user} is not the owner of ${element}, or permissions are insufficient, fixing."
-			chown ${ast_user} "${element}"
-			chmod u+rwX "${element}"
-		done;
-		eend 0
-	done
-}
-
-asterisk_run_loop() {
-	local result=0 signal=0
-
-	echo "Initializing ${ast_instancename} wrapper"
-	OPTS="$*"
-
-	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
-	touch "${ast_rundir}/wrapper_loop.running"
-
-	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
-		if [ -n "${TTY}" ]; then
-			/usr/bin/stty -F "${TTY}" sane
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
-			result=$?
-		else
-			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
-			result=$?
-		fi		
-
-		if [ "$result" -eq 0 ]; then
-			echo "Asterisk terminated normally"
-			break
-		else
-			if [ "$result" -gt 128 ]; then
-				signal="$(expr "$result" - 128)"
-				MSG="Asterisk terminated with Signal: $signal"
-
-				CORE_TARGET="core-"
-				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
-				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
-
-				local CORE_DUMPED=0
-				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
-					mv "${ASTERISK_CORE_DIR}/core" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
-					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
-					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-					CORE_DUMPED=1
-
-				fi
-
-				[ $CORE_DUMPED -eq 1 ] && \
-					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
-			else
-				MSG="Asterisk terminated with return code: $result"
-			fi
-
-			# kill left-over tasks
-			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
-				kill -9 "$(pidof "${X}")";
-			done
-		fi
-
-		[ -n "${TTY}" ] \
-			&& echo "${MSG}" >"${TTY}" \
-			|| echo "${MSG}"
-
-
-		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
-		   [ -x /usr/sbin/sendmail ]; then
-			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
-				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
-		fi
-		sleep "${ASTERISK_RESTART_DELAY}"
-		echo "Restarting Asterisk..."
-	done
-
-	echo "Terminating wrapper loop."
-	return 0
-}
-
-start() {
-	local OPTS PID
-	local tmp x
-
-	local OPTS ARGS 
-
-	setup_svc_variables || return $?
-
-	ebegin "Starting ${ast_instancename} PBX"
-
-	eindent
-
-	# filter (redundant) arguments
-	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
-
-	# default options
-	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
-
-	# ensure that ASTERISK_RESTART_DELAY is integer.
-	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
-	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
-
-	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
-	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
-		ulimit -c ${ASTERISK_CORE_SIZE}
-
-		if [ -n "${ASTERISK_CORE_DIR}" ] && \
-		   [ ! -d "${ASTERISK_CORE_DIR}" ]
-		then
-			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
-		fi
-		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
-
-		cd "${ASTERISK_CORE_DIR}"
-		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
-		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
-
-		OPTS="${OPTS} -g"
-	fi
-
-	if [ -n "${ASTERISK_MAX_FD}" ]; then
-		ulimit -n ${ASTERISK_MAX_FD}
-		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
-	fi
-
-	if [ -n "${ASTERISK_NICE}" ]; then
-		if [ ${ASTERISK_NICE} -ge -20 ] && \
-		   [ ${ASTERISK_NICE} -le  19 ]; then 
-			einfo "Nice level                : ${ASTERISK_NICE}"
-			NICE="nice -n ${ASTERISK_NICE} --"
-		else
-			eerror "Nice value must be between -20 and 19"
-			return 1
-		fi
-	else
-		NICE=""
-	fi
-
-	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
-		if [ -x /usr/sbin/sendmail ]; then
-			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
-		else
-			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
-			unset ASTERISK_NOTIFY_EMAIL
-		fi
-	fi
-
-	if [ -n "${ASTERISK_TTY}" ]; then
-		for x in "${ASTERISK_TTY}" \
-			 "/dev/tty${ASTERISK_TTY}" \
-			 "/dev/vc/${ASTERISK_TTY}"
-		do
-			if [ -c "${x}" ]; then
-				TTY="${x}"
-			fi
-		done
-		[ -n "${TTY}" ] && \
-			einfo "Messages are sent to      : ${TTY}"
-	fi
-
-	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
-		einfo "Starting Asterisk console : Yes"
-		OPTS="${OPTS} -c"
-	fi
-
-	if ! getent passwd "${ast_user}" &>/dev/null; then
-		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
-		return 1
-	fi
-	OPTS="${OPTS} -U ${ast_user}"
-
-	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
-		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
-		return 1
-	fi
-	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
-	
-	if [ "${ast_user}" = root ]; then
-		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	elif [ "${ast_group}" = root ]; then
-		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
-	fi
-
-	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
-	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
-	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
-	result=$?
-
-	if [ $result -eq 0 ]; then
-		# 2 seconds should be enough for asterisk to start
-		sleep 2 
-		is_running
-		result=$?
-
-		[ $result -eq 0 ] || wrapperstop
-	fi
-
-	eoutdent
-	eend $result
-
-	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
-		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
-			# asterisk can crash during startup ...
-			ebegin "Waiting for ctl file to appear"
-			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
-				sleep 1
-			done
-			is_running
-			result=$?
-			eend $result
-		fi
-		if [ $result -eq 0 ]; then
-			ebegin "Waiting for ${ast_instancename} to fully boot"
-			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
-			eend $?
-		fi
-	fi
-
-	return $result
-}
-
-wrapperstop() {
-	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
-	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
-		ebegin "Killing ${ast_instancename} wrapper script"
-		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
-		eend $?
-	fi
-
-	# The new one (due to "hardened" requirements) uses a simpler
-	# flag to indicate running or shutting down.
-	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
-		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
-		rm "${ast_rundir}/wrapper_loop.running"
-		eend $?
-	fi
-
-	return 0
-}
-
-forcestop() {
-	setup_svc_variables || return $?
-
-	# Just to be sure - when we want to forcestop we should make it all tear down.
-	wrapperstop
-
-	ebegin "Stopping ${ast_instancename} PBX"
-	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
-	eend $?
-}
-
-stop() {
-	setup_svc_variables || return $?
-
-	wrapperstop
-
-	if ! is_running; then
-		eerror "${ast_instancename} is not running!"
-		return 0
-	fi
-	
-	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
-	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
-	# Now we have to wait until asterisk has _really_ stopped.
-	sleep 1
-	if is_running; then
-		einfon "Waiting for ${ast_instancename} to shutdown ."
-		local cnt=0
-		while is_running; do
-			cnt="$(expr $cnt + 2)"
-			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
-				echo
-				eend 1 "Failed waiting for ${ast_instancename} to stop."
-				return 1
-			fi
-			sleep 2
-			echo -n "."
-		done
-		echo
-	fi
-	eend 0
-}
-
-reload() {
-	setup_svc_variables || return $?
-
-	if is_running; then
-		ebegin "Forcing ${ast_instancename} to reload configuration"
-		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
-		eend $?
-	else
-		eerror "${ast_instancename} is not running!"
-	fi
-}
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 81cef2862ad2..83751c3f3abe 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,6 +1,3 @@
-AUX axel-2.4-bffr-overflow.patch 333 BLAKE2B 67dcc951faf0090673d2e5ff48291b28981ea401052602b2e3c054d1d0485e02d4acc22699c08ac0fabcc2402450d9ce7bceadc0e428234a7e1446c441d9df3a SHA512 8072f7a7d15028f2272e45f6b42704fb3cadb30aec1ade093c80ee3b5d983d6362ed426c529bf46864f3f1adf8d2cd582be632796c8abcb43b125db87b1f0f75
-AUX axel-2.4-buildsystem.patch 566 BLAKE2B 47dd700ec0506824ff2bc3509a6c43cbd0b0b6c1676cb0600ec0ed96d4fd3f0daf7ccd3619f277c6bc7961fc3aeca18f12174bceb3cecd58b259d63f5520db7e SHA512 5a6d087a959adb88aed6ae7df602e3731c9a6773877eb731e670ab854c20fd0e41e24a91b759192882ccb9c5dff2a07d51f73b5e5cbb868f25b0aa991b6af428
-AUX axel-2.4-max-redir.patch 412 BLAKE2B 62146c6f0da6fdff0fe89aeeb487094020b04eee4d7ffbe223217910e32b81a5fadfb5a9e90a1602ee0ad80e6da47b2948b8eea534ef2cda53602fc8b753f9a5 SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491
 DIST axel-2.17.7.tar.xz 202632 BLAKE2B 2d799ad39c0742e2edfa09dd19f9d941c54c6136f4d5ec5a95f85d338bdebcc79545205cd1dde6ef25d28c89f494ae3cc278c73e375c9f4a96dabff73b139257 SHA512 ed1815199a7cc78897a820e1938a80dba72b83e1b40e6c1e81c6d3457aaa17faf20148a82383768524d61bbabda5b00cdcb2c15ff8ae5ed74e415da0b53be3aa
 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
 EBUILD axel-2.17.7.ebuild 1260 BLAKE2B 1f976957b0425607de9728fc358454134191a4d0d136700d144d19f4348bead0e3167221091f9bd458d631f2bc09d5c9b4034175517659249174923bbd87ea69 SHA512 c5e24d64e0b781e7caa596eee0c82ee78a7d3fce9d8557e13a88c89a4eefe414e054ff4d80b5d9672d2cf9155575ae2fadfab15fb12e625daafda57231bf3cd8
diff --git a/net-misc/axel/files/axel-2.4-bffr-overflow.patch b/net-misc/axel/files/axel-2.4-bffr-overflow.patch
deleted file mode 100644
index 24fae8ce19c0..000000000000
--- a/net-misc/axel/files/axel-2.4-bffr-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- http.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/http.c b/http.c
-index 5d64e9b..db91701 100644
---- a/http.c
-+++ b/http.c
-@@ -164,7 +164,7 @@ int http_exec( http_t *conn )
- 		{
- 			i ++;
- 		}
--		strncat( conn->headers, s, MAX_QUERY );
-+		strncat( conn->headers, s, MAX_QUERY - 1);
- 	}
- 
- #ifdef DEBUG
diff --git a/net-misc/axel/files/axel-2.4-buildsystem.patch b/net-misc/axel/files/axel-2.4-buildsystem.patch
deleted file mode 100644
index a1571f0fc576..000000000000
--- a/net-misc/axel/files/axel-2.4-buildsystem.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1c3863a..b43fcff 100644
---- a/Makefile
-+++ b/Makefile
-@@ -51,13 +51,13 @@ uninstall-etc:
- ### MAIN PROGRAM
- 
- $(OUTFILE): axel.o conf.o conn.o ftp.o http.o search.o tcp.o text.o
--	$(CC) *.o -o $(OUTFILE) $(LFLAGS)
-+	$(CC) $(LDFLAGS) *.o -o $(OUTFILE) $(LFLAGS)
- ifndef DEBUG
- 	-$(STRIP) $(OUTFILE)
- endif
- 
- .c.o:
--	$(CC) -c $*.c -o $*.o -Wall $(CFLAGS)
-+	$(CC) $(CPPFLAGS) -c $*.c -o $*.o -Wall $(CFLAGS)
- 
- install-bin:
- 	mkdir -p $(DESTDIR)$(BINDIR)/
diff --git a/net-misc/axel/files/axel-2.4-max-redir.patch b/net-misc/axel/files/axel-2.4-max-redir.patch
deleted file mode 100644
index f52796c35e2d..000000000000
--- a/net-misc/axel/files/axel-2.4-max-redir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- axel.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/axel.h b/axel.h
-index e90d30d..f6ebfe8 100644
---- a/axel.h
-+++ b/axel.h
-@@ -66,7 +66,7 @@
- /* Compiled-in settings							*/
- #define MAX_STRING		1024
- #define MAX_ADD_HEADERS	10
--#define MAX_REDIR		5
-+#define MAX_REDIR		25
- #define AXEL_VERSION_STRING	"2.4"
- #define DEFAULT_USER_AGENT	"Axel " AXEL_VERSION_STRING " (" ARCH ")"
- 
diff --git a/net-misc/connman-json-client/Manifest b/net-misc/connman-json-client/Manifest
index c1620f8e7517..3b097d9d1dba 100644
--- a/net-misc/connman-json-client/Manifest
+++ b/net-misc/connman-json-client/Manifest
@@ -1,5 +1,4 @@
 AUX cjc-fix-for-json-0.14.patch 1554 BLAKE2B a521777f66e34a425306c03f92096731f8ad93f6001930efabafbc4764ce698110a482063f53dcb0eec34a3ffae871407ef1ff53a6a918a6c809decee9b85cc7 SHA512 6a545259c2ffa4f9c5e628566890264aaf2be908e2a2a3313812777a28e1b57a60f1c8920f88f25a0574fe1a2e101c8dd020b51cb22ae1ebb851cca3b0f3bb50
 DIST connman-json-client-1.0_p20150721.tar.gz 55520 BLAKE2B 81f81721563bb8a7c4e604e8a036b162329f1334092f345438c34f787bceb8e548d69e0c206773b880799d1327858275bbbade59d1b84271e4fc05372937ce7a SHA512 77cfbc9f1b57ff5ce73a80f42198bbdb7120db6510f3f33251465ed83d1fac3b2bb41e3959f43cc8d274d37c8da375009a07e9003664482136eed64f5b32c0bc
-EBUILD connman-json-client-1.0_p20150721-r1.ebuild 743 BLAKE2B 595dbdb5c7fd0bad7c1f52f72fd358bc08111f8689c0cf1fb7637f709a14e8c714ab9c836d479a8e9591eddd8c483801c83e4c5af67555c4c22ceb3b3f79e5a7 SHA512 47981ff59de9d818f890829e7303ce4e9264ba9835dc95ac5c3b68bba66a95dc1dbe09e116a2102c4ee4334d067ad8f0aa5fa53ab51fa9380081df9d413b891b
-EBUILD connman-json-client-1.0_p20150721.ebuild 688 BLAKE2B 8ff4b658ab133591302bcaad1e0b326e3526e7322538f63350edbf0e94818bad9cfc74f3cda28cebbd50e52775400ed5c026cfc1e3124a7fcbe847f290964d17 SHA512 c7cd3fcf259ad093dc6ce3390ffcce967955207792aaa58f6ada4ea26d1bb3b01abcc0ae126d78b0a28062ff40591eaa36a8f8b6e584986b4ca4dc094ac9527a
+EBUILD connman-json-client-1.0_p20150721-r2.ebuild 788 BLAKE2B 88ba3ed6a0bc687211090152b38ea4f6a39435fbecc9c6555d77b6b85fffc65590436feb12bb3ff7f57cc501bd89c674040b23a3219bb077102c4070f0294c32 SHA512 1277acea76456709d7863d9e515960d6692b3c88dabb66bb3bab152937a3377bdf4195e5bd23c40f695a8fa2beddec5e28ddad03116bc3b9f7451d6744d397f2
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild
index 71df6bec7998..2fe35cf86af6 100644
--- a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild
+++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r2.ebuild
@@ -28,6 +28,10 @@ src_prepare() {
 	eautoreconf
 }
 
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
 src_install() {
 	default
 	dobin connman_ncurses
diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild
deleted file mode 100644
index 72908de1c1d7..000000000000
--- a/net-misc/connman-json-client/connman-json-client-1.0_p20150721.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vcs-snapshot
-COMMIT="3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2"
-
-DESCRIPTION="An ncurses UI for connman"
-HOMEPAGE="https://github.com/eurogiciel-oss/connman-json-client"
-SRC_URI="https://github.com/eurogiciel-oss/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/json-c:0=
-	>=sys-apps/dbus-1.4
-	sys-libs/ncurses:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e '/^AM_CFLAGS/ s/ -Werror$//' Makefile.am || die
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	dobin connman_ncurses
-}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 24f1053b1a5d..79957361ebcb 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,5 +1,7 @@
-AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
-AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
+AUX dhcpcd.initd 315 BLAKE2B c972ddd75c879d4e6a109cc4fd7b377ea27aef0b79ea5524cc456050117627c1baef8e884dbcd2cec987bac43efb42b77b426d6f2f864f09bf922142e08cd6af SHA512 f554a78c04ddae8fdc44a9427c5fc318d4eb31b6771bcc46e9b06feafc061ab9c1ceffb7d740cba57905f0820ca5e2313b152b217772abd5a9b9385e9aae7459
+AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8fc4c40dc4415fd70c83889b631606085ecf87f925a7a199cd5712178a2c90186c6b8ac4f792b0789 SHA512 cd186e4c0733fcd9c333bf7c813a879c38c962bcf6a3288577f6b1632312b10f69ac68ca413c32106559d9e53fa05de78410cba677247b52bcbcf3b35024974f
+AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
+AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 DIST dhcpcd-7.2.5.tar.xz 214124 BLAKE2B 7a5f32b66187afcaa2bb4a1cbcc0d704a28a27ff6d1f9fea409bab242ebf4d263d81590cb4a4959c9f1119966795e26fa582ed16a525c1e46a72dd0905868074 SHA512 ee0c70f3996f6a06031c2f663a4bdf4f147d637c31e54bb94fcb9d86282c33ad7b0f5569abe09acd7698efbb34c35afb228fe0825e4a95ad6a42832d1838ca72
 DIST dhcpcd-8.1.7.tar.xz 230308 BLAKE2B 636daad77885b7f00f34c73413db4a0269bca844c33b630b5302cfcd9f5b2068ed95872dd92f3b8db25e7b2ca0a28a8053e1975a7ee50fd5403f8d58e97dff17 SHA512 ea58ef3db8254d677820c44b2842ef2f3697b2d90fcbd89b2ecfcbac87e705047cac17053bbe076a3f6d2775903c8e75eac38089d25c097e2f24a045c24977e8
@@ -11,6 +13,6 @@ EBUILD dhcpcd-7.2.5.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1f
 EBUILD dhcpcd-8.1.7.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
 EBUILD dhcpcd-8.1.9.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
 EBUILD dhcpcd-9.0.1.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
-EBUILD dhcpcd-9.0.2.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
-EBUILD dhcpcd-9999.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
+EBUILD dhcpcd-9.0.2-r1.ebuild 5336 BLAKE2B 57dec388e06fd7a3ac298cf8a89170921f361cd3373b0366e3db2e518d4691ebfcd1fa97fab108b06f5c807a994e0b410f20b4b4965f41e5dae2744cc55d978c SHA512 f1ee8587337dde8fb94d32cd65b34db15e797c16b58cfe0ec3cdb2c1336a706572669831150df09965ce0b226daa49b1bdfd92074b7469f80a915e4e8458e2a2
+EBUILD dhcpcd-9999.ebuild 5336 BLAKE2B 57dec388e06fd7a3ac298cf8a89170921f361cd3373b0366e3db2e518d4691ebfcd1fa97fab108b06f5c807a994e0b410f20b4b4965f41e5dae2744cc55d978c SHA512 f1ee8587337dde8fb94d32cd65b34db15e797c16b58cfe0ec3cdb2c1336a706572669831150df09965ce0b226daa49b1bdfd92074b7469f80a915e4e8458e2a2
 MISC metadata.xml 661 BLAKE2B 079dd7ae7da62777750cda972982faec3a7040018c57a40b33874b20bbfcdf60a00487f38daaba2fcf10c2325c6d582d70983f5bb6fca64f309eaa81c615de93 SHA512 3b2db0737e02439895ee5d7fc06b9344c64282d4014ef1f7cc8ce19f93e8744aa929f85fba8f04c0a865f477a5066dfa083b568546665e870137c2989999e5e0
diff --git a/net-misc/dhcpcd/dhcpcd-9.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild
index 9656eabee928..ac18c5907ad8 100644
--- a/net-misc/dhcpcd/dhcpcd-9.0.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.0.2-r1.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 		$(use_enable ipv6)
 		$(use_enable privsep)
 		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
 		$(usex privsep '--privsepuser=dhcpcd' '')
 		$(usex udev '' '--without-dev --without-udev')
 		CC="$(tc-getCC)"
@@ -56,8 +56,8 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
 }
 
 pkg_postinst() {
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 9656eabee928..ac18c5907ad8 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 		$(use_enable ipv6)
 		$(use_enable privsep)
 		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		--rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
 		$(usex privsep '--privsepuser=dhcpcd' '')
 		$(usex udev '' '--without-dev --without-udev')
 		CC="$(tc-getCC)"
@@ -56,8 +56,8 @@ src_configure() {
 src_install() {
 	default
 	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+	systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
 }
 
 pkg_postinst() {
diff --git a/net-misc/dhcpcd/files/dhcpcd.initd b/net-misc/dhcpcd/files/dhcpcd.initd
index d3f4d76b4c90..b89b785fd23f 100644
--- a/net-misc/dhcpcd/files/dhcpcd.initd
+++ b/net-misc/dhcpcd/files/dhcpcd.initd
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 2007-2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
+# Copyright 2007-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 command=/sbin/dhcpcd
 pidfile=/var/run/dhcpcd.pid
diff --git a/net-misc/dhcpcd/files/dhcpcd.initd-r1 b/net-misc/dhcpcd/files/dhcpcd.initd-r1
new file mode 100644
index 000000000000..2616a743b0d3
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd.initd-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 2007-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=${RC_PREFIX}/sbin/dhcpcd
+pidfile=${RC_PREFIX}/var/run/dhcpcd/pid
+command_args=-q
+name="DHCP Client Daemon"
+
+depend()
+{
+	provide net
+	need localmount
+	use logger network
+	after bootmisc modules
+	before dns
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd.service b/net-misc/dhcpcd/files/dhcpcd.service
index 8430214d59b4..8f9ad25e4d01 100644
--- a/net-misc/dhcpcd/files/dhcpcd.service
+++ b/net-misc/dhcpcd/files/dhcpcd.service
@@ -7,6 +7,9 @@ Before=network.target network-online.target
 Type=forking
 ExecStart=/sbin/dhcpcd -q
 PIDFile=/run/dhcpcd.pid
+# Avoid duplicate output on stderr/syslog
+StandardOutput=null
+StandardError=null
 
 [Install]
 WantedBy=multi-user.target
diff --git a/net-misc/dhcpcd/files/dhcpcd.service-r1 b/net-misc/dhcpcd/files/dhcpcd.service-r1
new file mode 100644
index 000000000000..b4309c39b4c3
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd.service-r1
@@ -0,0 +1,15 @@
+[Unit]
+Description=Lightweight DHCP client daemon
+Wants=network.target
+Before=network.target network-online.target
+
+[Service]
+Type=forking
+ExecStart=/sbin/dhcpcd -q
+PIDFile=/run/dhcpcd/pid
+# Avoid duplicate output on stderr/syslog
+StandardOutput=null
+StandardError=null
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index a0eeb85c84b2..854b9abdd8a9 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,16 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-94.4.384.tar.gz 94254443 BLAKE2B 4d12d0268ea71f4d06304dbe29bcd54f3af4c39e10ba8be4892724c6dc556dd844e587f789cc957dad66d7bd44ae8fdac398cefbfb714a8b01d7f8c06b1d6d50 SHA512 710af644cdaf88a6db26f86b2cafd1bb729b4cd52aab4a3328c9c3061183db32db016adb6d8dc9c5a2fc860a55c3abc712a774ac3e635459c605e91c0178c37e
-DIST dropbox-lnx.x86-96.4.172.tar.gz 95619165 BLAKE2B 3d839e3ea9e1b9a7399693e8540230a8bd173b1cbe7fb9ee3a85621f6a3c59bc8c2c58d2f8e0f0998dcd9b0d77cbfcb006c9b543609546efca6ae8d85817b5ee SHA512 83ee64f7db74742c375fca8fa661da0774c3ec451cfe6cc71e5879427e8f822ae9f533ca2920bc01158b05dd52fac9f89fb3bd8928a2a71c4df4162f67547e22
-DIST dropbox-lnx.x86-97.3.451.tar.gz 96560209 BLAKE2B 9ca8b50afddb8e0435cc1e408fdb10a12a1097baebf7241033661ac26e5d8c369b09bb6dfe707d1f0f3f6a79832ff0ae097eed859b0a3612574fb69d9d74fd47 SHA512 d50ba534f3b7b87755d09ffb216cc8741f0d520c088577fbda486aa4debd7317fd87fa7a86a0131800b1cdd75a60f2ee6c1b7d264a8e75b11d7d619e509f221e
 DIST dropbox-lnx.x86-97.4.467.tar.gz 96556504 BLAKE2B 1959c134126870e2d86b925766db9466be49fa0f71caeadac79f529194e85afeb4b45e47507a6786a2dc91cdb1cd976ec02110dac2c9d2abd71d789fd81204ac SHA512 fa056a96c1dd68f8c691c21b73d6d7159472616d2d67611a7ee01cb9b6bc4eeceed04087cb77114d6a62a715cbe82f828c6e75e4e92d3a4ce88ca7bbc2d71dd4
-DIST dropbox-lnx.x86_64-94.4.384.tar.gz 98561877 BLAKE2B ff1ec6a8f76b9b79ed3cfe34d5dd5642886d01631bba062ba15528929e1068425fadc403c8a7fb3242b08c2d2742a2f4ccd255c8772691ee1e4f1b8693be4dcb SHA512 e905b283ef435d7b6c0d7973f49e8c0a4a5e7c25c2570967b24bb8476ef1889f63d01e7951f1c6d78a5c6851e1a30737b9297032dede1540e3bf391c56bc0c8b
-DIST dropbox-lnx.x86_64-96.4.172.tar.gz 99944904 BLAKE2B 0b9b6c3d283de2751df9c083f7cf4ec8bd013def2a6cacc1a006e5a66ef5d0451d5c1faef3b10d7295ff3c23b941e48248126064e9eab6391e11ad7c193ebb01 SHA512 1aaf4b3e88e047f184af813d80e7754649ab33f2337ae1555c7d408d3358195e48cb0b1daaae1fe6f8a1e572ea087960eb2bda2413158f60588e022f5f01136f
-DIST dropbox-lnx.x86_64-97.3.451.tar.gz 100909755 BLAKE2B 75de9da05ebdb1c1da0d604d8e7aff3fd1fa5a6b9f281cb8ae20f673ea05f0a4af775d6c5926fc5962782c896a71aaa48651c7b49e05ed4bc783f64275b1fcce SHA512 501e8754717a91b1fe01ebe5f895341b3ab74da97633faadf3bcf81735672efd6beffa87125aad7e32e851ef656cf5ba8951e57ecc6180a2f3b77af37a629e65
+DIST dropbox-lnx.x86-98.4.158.tar.gz 96568004 BLAKE2B fc9ae4cf5d9ad1798dd5d55bf90cd5e77e7cd7405626fb55d4693e26d028d97a81d2843eb03d60de94f552cc446fffa4caa679ba3a750098a58549fc78ff4c67 SHA512 ce6432bbec1ec024e6753a93f2d0eed3af60de521f411f52efb63767eb500a85da80102a011e077fd9953d4827403d02143b186f30137ef7a338cb01664911a2
 DIST dropbox-lnx.x86_64-97.4.467.tar.gz 100899563 BLAKE2B 0ab7b98d9e1394ce997aa456157a85586addb0c82f47d831721bd36a716cb3117b280e2753040369bc04d5a0360a3861a34e9381dcba747fdb4a38e11d4dd34a SHA512 05ddc063c9dcfb8b9b03f93f0b298b53d90702aef25ce44254efc1e7b21c0e767702c91cbfa3b1876a4c32980f80dd34eaf40453d76d093635df17818f663c9c
-EBUILD dropbox-94.4.384.ebuild 2561 BLAKE2B 9c6df8557694385a3817b26c068731524c3cfd72b8fc6514be8fd1646ee1c7073a101cc24e82f5dae9bc16fdb2cebcdad621d8d9a963aaa486659b2adc32b7ec SHA512 5de8951c0dfb17269b659ed76fc3260c93e1c2c3ea91f3a1070cb7b2b02a15b252696ecf4d8223d1d3cc1f46df08d9ba2c365a177c4c9632e1a129c054428188
-EBUILD dropbox-96.4.172.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
-EBUILD dropbox-97.3.451.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
-EBUILD dropbox-97.4.467.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
+DIST dropbox-lnx.x86_64-98.4.158.tar.gz 100751556 BLAKE2B 8ebbfa7101852e531edf9c6b3318c14418c95a0e618ce3725411e6fb1dbae70860de9b0daeba4c824fff0b3bd5f9a9347a4fe09c1433f76be3b3cc86184d769e SHA512 00db27742f8dff9d3fb96f06fcefdb30450b675b3c3cd35df717908455a8b1ca0419efff8932022d82c89dd3fccca183bc1bb16a1fb25c0505c49dfd03b06a19
+EBUILD dropbox-97.4.467.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
+EBUILD dropbox-98.4.158.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-94.4.384.ebuild b/net-misc/dropbox/dropbox-94.4.384.ebuild
deleted file mode 100644
index 48bae48934d8..000000000000
--- a/net-misc/dropbox/dropbox-94.4.384.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${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"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		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() {
-	default
-
-	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_native.*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	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}
-}
diff --git a/net-misc/dropbox/dropbox-97.3.451.ebuild b/net-misc/dropbox/dropbox-97.3.451.ebuild
deleted file mode 100644
index 38f892d3ba40..000000000000
--- a/net-misc/dropbox/dropbox-97.3.451.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${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"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		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() {
-	default
-
-	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 images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	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}
-}
diff --git a/net-misc/dropbox/dropbox-97.4.467.ebuild b/net-misc/dropbox/dropbox-97.4.467.ebuild
index 38f892d3ba40..fdd08dee9730 100644
--- a/net-misc/dropbox/dropbox-97.4.467.ebuild
+++ b/net-misc/dropbox/dropbox-97.4.467.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/dropbox/dropbox-96.4.172.ebuild b/net-misc/dropbox/dropbox-98.4.158.ebuild
index 38f892d3ba40..38f892d3ba40 100644
--- a/net-misc/dropbox/dropbox-96.4.172.ebuild
+++ b/net-misc/dropbox/dropbox-98.4.158.ebuild
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 8a7010fc950b..bbb500376b86 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r1.ebuild 703 BLAKE2B 8341cd37890bc12d298d48d3a99600de6ccbdcd5c98e3e13876a98638dac3abedf630a65afb8bbc1c42505d963d2f1dc9652029f32691e0e6c8c49f77ca7d9ee SHA512 1f4b9720e992bc667ea4d7581224602653a1f9b527c5c89208e3fe2bc6f69c547aa371ac049739fec12aea1010267bf6c692b43acd6863266b0e87d7f7ce64b4
+EBUILD econnman-1.1-r1.ebuild 694 BLAKE2B 441e096663d2c1385477bebfced3e9eb60b339f733dc1c5445a10b61ac5af67332904e290bbd684c6a2e625ec418c6d465f67f9cf7bf437be96d12df4e7a2c46 SHA512 715a19ae343f31ef176c17f47a43163ae8634db6604a5b8ba3f842c78f288bca7e5a4f05ab101221dbb64f9beb203266bf888a5ea7d707d34749907d9be739cd
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r1.ebuild b/net-misc/econnman/econnman-1.1-r1.ebuild
index 6d4692fd9f99..e06b74d6f94b 100644
--- a/net-misc/econnman/econnman-1.1-r1.ebuild
+++ b/net-misc/econnman/econnman-1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit python-single-r1
 
@@ -18,13 +18,11 @@ KEYWORDS="amd64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
-RDEPEND="
-	${DEPEND}
+RDEPEND="${DEPEND}
 	dev-libs/efl[X,connman]
 	$(python_gen_cond_dep '
-		dev-python/python-efl[${PYTHON_MULTI_USEDEP}]
-	')
-"
+		dev-python/python-efl[${PYTHON_USEDEP}]
+	')"
 
 src_prepare() {
 	default
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index c34a68ac9b14..a0d3e6c81300 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,4 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
 DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
-EBUILD electron-cash-4.0.2-r2.ebuild 3560 BLAKE2B 733d818311c88760706e995c616b0a9ecf756cfee6a7830001d3710b3dad0624a40975d78959851e0fdf897a313a8f0bebe973cb29a7eab4ecd42096d9d3d7da SHA512 96c3e23caf8de041b17d17264adda93197b24750acf71c10958baf40fb7fbee2a4ec4898aa789ebbbb04b4975f145d90878c8943a49d206d18d157c3bf936399
+EBUILD electron-cash-4.0.2-r2.ebuild 3568 BLAKE2B a462278cf1c8bdf62c3722dad69a183e3fe32758da7f0c2a9ff27a926ce5a783e0aecfcdf5c5a181cdcbef99197819b0c6072c4855f6e6c93c73018268bebe7a SHA512 e55892b13afd1362ed1fe6c4c435b2dc4e0ed6772d2b7718d93da4419f6a5809506fced280627c9888fc4d9c8e7244cd3a29a9d46c0378ec87e353dbfe13abc3
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
index 87c2b57dd7c3..c1e564a5b3e2 100644
--- a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_6 python3_7 )
 PYTHON_REQ_USE="ncurses?"
 
-inherit distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 gnome2-utils xdg-utils
 
 MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index c80e6f54a45b..facd783fd331 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -7,6 +7,6 @@ AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe
 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
 EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
-EBUILD endlessh-1.1.ebuild 1273 BLAKE2B 26818f880049315c57b94bc1609a80de6e36ced2c59bef26fe48cedeedfeca40287de5db60faf65eca27c90cc621d3ee75b566e8f1d6eb4936e1db7ff612fb94 SHA512 b0fc2fe1419ea01d66e3b672d48e5ad3cfe6b5a168b520412432677f67604ce5c2bce635e19369e79e8041d24d40b6aa7ff431db909f6c79589759241079a7c3
+EBUILD endlessh-1.1.ebuild 1280 BLAKE2B d543e35271f1bfc4c7616e12a3cd4093aa85879a4184c8dd02a3c91204f12ed9c8c4cfd654a91cb112ca8688219ca2f56284e0848543f773ce37aae851a9b97f SHA512 9fbbfb758374d49b0446cdd3142f58d021bf306cce7fc9b8504ddbb7a03b10f96605146f729111edd3450bc7f8bb5624980e743c48d80a7c063e0f2308136cd9
 EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
 MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf
diff --git a/net-misc/endlessh/endlessh-1.1.ebuild b/net-misc/endlessh/endlessh-1.1.ebuild
index f79dee7a10e3..076f1f1161cc 100644
--- a/net-misc/endlessh/endlessh-1.1.ebuild
+++ b/net-misc/endlessh/endlessh-1.1.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ppc64 x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/net-misc/etherdfs/Manifest b/net-misc/etherdfs/Manifest
index 173928861466..90da108b76b2 100644
--- a/net-misc/etherdfs/Manifest
+++ b/net-misc/etherdfs/Manifest
@@ -4,5 +4,5 @@ AUX etherdfs.initd 242 BLAKE2B b3109ef0534637cecb3d116254457c562e59c44042e94b3cf
 AUX etherdfs.service 210 BLAKE2B 0e3243da13f6be2251239fe43a5c675388175a1e62d4119cba30a2a35f6ca69572ff3176d944e39d55e442cb3cd1b599a8ce6d09bbd5ddefb9bf0c67aff216d5 SHA512 13a555a8c4e82f3b033d946f82064fcb0c3d026393da8abcff9336e6a20d36b2185fac3b3562dde59260c43b8a45b1c6dd1e95faf40abc870605e50f0fc8b381
 DIST etherdfs-20180203.zip 13081 BLAKE2B 53b0d12c272aa8a64a1980b6c4aae8c6789647026590ee948bc4d84be265479a816d8ae4df033a9a8be4038eb10b934b6ee8d188bf88e47c21f2e81123a572f0 SHA512 c254647fb35b7456b08eb27e6bc6b339d65c55ffd28fdc658f54bb1346a94a7056959a6e3e0b1a97add9e7919a224a0cef831ee14fc19219885274c9649a3439
 DIST ethersrv-linux-20180203.tar.xz 18160 BLAKE2B 45293b596489a290146bfb5ec5ca89c06a01bd0377cb29f33f604ac84c3d1d8f18f09058dded28e38f611a19d690c0a190ec38d45498cacd90a4cbff841115e1 SHA512 522f5ce5353c6eabaac2106d43d09cf341a2da96e56ffb06c5b2d705a997986117246cf3cb2b4a4e5b2c6f1caf96dfd68d1ddc56bb6db8140aa3761c7e6e6f7e
-EBUILD etherdfs-20180203.ebuild 1020 BLAKE2B 00b1fd05f98d20dd9ee4d8ae551fbe7249f6bd9e83d6c970c746ff31b6f64a60dd50768758fe6a307379a74087f7c889a4cf48d1d2ed52717ba5e4de2efea397 SHA512 8716e45c3c032ac46aae5a73d07a3440de8d629ed2c9d781bb96c0c83a21ff5b52bf097129bd873c72096bed983d99589ad92e77ba08bb0a3650ab7b3389fbd1
+EBUILD etherdfs-20180203-r1.ebuild 1134 BLAKE2B cb68ca9a4dd33fac48543ce3c9d067b6969ecb9b7853287352f0fb775fd573ce80630285476c85ad13433744083535bde76692efe9e050f2baba329e7be7167d SHA512 9242a05f575142e37b376cb04298a81089ed45db5c43b07e63e922e2427c6e4607a341e87d6f536c46d575734f3689123abf7db17adad1a0ba63062909abcb6f
 MISC metadata.xml 628 BLAKE2B 098bc7b2760258e6eb715561d32f0c2674e2e0ceb4a755d1cabf695bd938f68a9a1809f232ce136a395b00b5055b7ea31bbe7db0f1206ae5a435340089a79cf7 SHA512 1a8106a9ce7418f4a118cb143dd8605a84c38376edad4583dbfafab913738dc96e26c6e24cd65e29d408cb975f2741d37303bfbf3c99d2a966376486db526dcd
diff --git a/net-misc/etherdfs/etherdfs-20180203.ebuild b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
index 5a35f39a6a70..d5a7bfb7698e 100644
--- a/net-misc/etherdfs/etherdfs-20180203.ebuild
+++ b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,13 @@ PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 DOCS=( "ethersrv-linux.txt" "history.txt" )
 
+src_prepare() {
+	default
+
+	# Respect users LDFLAGS
+	sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -i Makefile || die
+}
+
 src_compile() {
 	tc-export CC
 
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 1588a6370849..068e8bf9d83a 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,3 +1,4 @@
+AUX eventd-0.27.0-fno-common.patch 323 BLAKE2B a6ddf695edf40bfb6a1b247d0a82d899d5162f3b59ca3a5879b300deafdbdae31557edea1ccfc4bc183cc1e9d3ea2124305951ad29dfab15428cf9ba0fab4997 SHA512 5ca3560d6b046debd58ea682d302f22a9884426112cecedb577b5f1da5de10489f435f55978affaf6fd69d43d72d547f617e141b209d9e02e32651286afd639d
 DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302
-EBUILD eventd-0.27.0-r1.ebuild 2590 BLAKE2B 17919f8f3343bb00c4fed7a87315427290806d457c3d4243bf00ad98a0df71e3eddbc3e240852ae83e892d95166419755b7c101dbd1a9d4131449ec5acad9dab SHA512 09de971721608429bb3da6dbf596516986aa4f24b71bd683de1d610cb25914061f93d13786822257c555e7f512262cda46710d449bf93f70d1067c320f4cf1b0
+EBUILD eventd-0.27.0-r1.ebuild 2659 BLAKE2B fc0f66a8f6705146cc96ec89aebbc546bf52444da8c1cba330f15f34a5241445ab81b64652ed675855e6c7a00809251a12ee80773077cda8da21ed5a43a80e45 SHA512 5be5bff1b857f0123d7abe839c42464379ac10749443b7a830e4684b6c45ea8fae5240210cbb9b88b144e6f3604c187d0f166988ae0ff32b1467632b5b942c0b
 MISC metadata.xml 907 BLAKE2B f615133974e8aa1afefed00bf6d5e856b18feac63189f8c338de145145c10870de3bf45a764c53c9003fbac6215961ba9e4ca8898c0e2089545a20bc3b147342 SHA512 9132a923a1c3b140374a480473665aa85ab0a9d8f7aa74298a78b4905c5d2bbb97a0fa9d8564c600a9023f64e67151ac47b9443c55e6e7642bbebaf22da061aa
diff --git a/net-misc/eventd/eventd-0.27.0-r1.ebuild b/net-misc/eventd/eventd-0.27.0-r1.ebuild
index b0d6a59a9665..e533b5124a7e 100644
--- a/net-misc/eventd/eventd-0.27.0-r1.ebuild
+++ b/net-misc/eventd/eventd-0.27.0-r1.ebuild
@@ -13,8 +13,7 @@ LICENSE="GPL-3+ LGPL-3+ ISC MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
-	pulseaudio purple speech systemd test upnp wayland webhook websocket
-	+X zeroconf"
+	pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -51,7 +50,6 @@ COMMON_DEPEND="
 	speech? ( app-accessibility/speech-dispatcher )
 	systemd? ( sys-apps/systemd:= )
 	upnp? ( >=net-libs/gssdp-1.2:0= )
-	wayland? ( dev-libs/wayland )
 	webhook? ( net-libs/libsoup:2.4 )
 	websocket? ( net-libs/libsoup:2.4 )
 	zeroconf? ( net-dns/avahi[dbus] )
@@ -66,6 +64,9 @@ RDEPEND="${COMMON_DEPEND}
 	net-libs/glib-networking[ssl]
 "
 BDEPEND="virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.27.0-fno-common.patch
+)
 
 pkg_setup() {
 	if use ipv6; then
@@ -75,17 +76,18 @@ pkg_setup() {
 }
 
 src_configure() {
+	# wayland disabled due to missing dep in ::gentoo, wayland-wall
 	local emesonargs=(
 		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
 		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
 		-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		-Dnd-wayland=false
 		$(meson_feature websocket)
 		$(meson_feature zeroconf dns-sd)
 		$(meson_feature upnp ssdp)
 		$(meson_use ipv6)
 		$(meson_use systemd)
 		$(meson_use notification notification-daemon)
-		$(meson_use wayland nd-wayland)
 		$(meson_use X nd-xcb)
 		$(meson_use fbcon nd-fbdev)
 		$(meson_use purple im)
diff --git a/net-misc/eventd/files/eventd-0.27.0-fno-common.patch b/net-misc/eventd/files/eventd-0.27.0-fno-common.patch
new file mode 100644
index 000000000000..5f731666738c
--- /dev/null
+++ b/net-misc/eventd/files/eventd-0.27.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/plugins/nd/src/backend.h
++++ b/plugins/nd/src/backend.h
+@@ -37,7 +37,7 @@
+     _EVENTD_ND_BACKENDS_SIZE
+ } EventdNdBackends;
+ 
+-const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE];
++extern const gchar *eventd_nd_backends_names[_EVENTD_ND_BACKENDS_SIZE];
+ 
+ typedef struct {
+     EventdNdContext *context;
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index fa2f68eae8e7..fba7197a7518 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,7 +1,10 @@
-DIST exabgp-3.2.17.tar.gz 596373 BLAKE2B 410b77af542160334d32e3e3ea54b25f45c990c56fe2dbef0714576eb9e728cebe6d1463c0f22b1240aaf8e99ccabc5f7334cd6c2b3c77426c94b2c048c8783c SHA512 69dbff75caf287e9e0f6ab3707a2bbd576b0b4c8a8c318217cf88c8a1c417d47915b038bc7d64be3bbce9771caa550275703e5543fb5799afc7149dc9f054416
-DIST exabgp-3.4.26.tar.gz 544456 BLAKE2B 75f62ce8a68588f711e86208f00cc6de9ae51a5c82f833b91459bc05974c8eff06fec080823adfecea7b75a43caa3310f6395bd22ab4e6a696f230787bbaae23 SHA512 6cfcc8a40e1e05dfa76df46d8b5e13ce85e73f078d6ab4d2e23dd85035c1ed52bbbaaaade81602ea7572841e6e20d7d7183a7e968599f9e8314e1b89e3a6341f
-DIST exabgp-4.0.10.tar.gz 2907852 BLAKE2B 2fad6c853aa7a6f136da3334df4b3bdcaaacd03d3fbf849510bcd40b0639bbcc521726797a196418f0ecd47047c65356ee047d30b009ee01b9d498e354ea3bfd SHA512 a21f49e5e99e28cc848cddfd3992dc18ba57d879d0964da0b906d16dca37aa05a00892d643d6cdeea80d4e629fc55a014d9bc50764d520fda77e94145297832e
-EBUILD exabgp-3.2.17.ebuild 435 BLAKE2B f9075fca0cc83f4ab693453fd434538fa72f7b7efe0f2702b9fd7fbc40fced273dac906be1d24fd2ebb58b350df862a95e0dd22859123703871546062e8f6806 SHA512 200dbcc99913a28bd69a7ebde17b729efb280fd1c79e7cd99196c1648f60f771ddac734dbd56d5c4ecc182fd00e9d9d7d89e7b46ed09e9c67bd9c35d544f8359
-EBUILD exabgp-3.4.26-r1.ebuild 400 BLAKE2B 0be76cb073e639dc6bc3a4dc61da8dd3da7c63c407af1af08c3e18a4d224ca87092f91d647dd3a8eecd1595680c0521898f7c378679c6816a430eb47422e01b6 SHA512 50fc08f265c6f5025426257d4ad5c6039137450654a2cc9116c29d61c6f07a16379be4adfb6b62f746bcfaa1e00e92b3b56ed2cde070df9e549a2807f89ad71b
-EBUILD exabgp-4.0.10.ebuild 392 BLAKE2B bd1b2536cfafc2c240afa8ac33407837aa5116893dbad65aeba410d4abfa6178dc1c83939d9c1268348d5a3b3d55027202182fafc4eb0770e98457e982124202 SHA512 a280748ff18326e80b1495b62acb966ea2116cae379d1e68cb9df1d7af95174bd88cdd2a789d0af4c2d6deaa4ffb8309e057b073c3eb03165f7116b5aa4fc1e4
-MISC metadata.xml 339 BLAKE2B 863e3a5221b0dc3ef29b27b0d27a0941adc634d0287881bc586005ac6ed60e33e7a1dd48d63b237a78581b7a9890347a8ecc5346ad90cae732763235e486f8ae SHA512 81c99b9e586b1873b2949359be5147e2651e1b7a7e81aed124f54248f2c5f96ffe68f19f153d7029ec8a16e04b1a71b0c6c79c4c747d5901079a536d716acdc8
+AUX exabgp-4.2.7-paths.patch 302 BLAKE2B 52110fefb75e0a36452ea3e53f099897b30df8287d033b353f66df25cf75c4a75a80e91ef49a47c652a46274faabfcf5385653ae03eb75ed1afd866c068967c7 SHA512 678258e4848b17b9880849cb8d105ee64b4cb6bdd678c3c96707467a2bae51c30d34b8609bf5c9a48bcd0722f6247b009dc5c406a3bab02d77bf2f919e7f4fbc
+AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fec99f148c1bab3bc7feed80c46b8bac2ac639b720daa320bd141f65b25a37a6ce1f229653f3741 SHA512 7b888ea5053ebb8da9acbd4a85b6a9900663cadb89258aea86d47cade505e8bbfc6e741fed599d410480467f76f759175d710c284bc6caafdabb4a61c53611ac
+AUX exabgp.initd 1472 BLAKE2B 488c1de5222be9f5f67e279fa9607c326922d80c2aafa6cb098f5f721ef1df30f1d56a2a0a0ef6ca376cdb00f65cb1fc644214248b7ea9dbc9dfd55442be7d2b SHA512 453ab87961b4647374af62a02280e750ba0b1bf535a5e92c4434c4ff6c0a55f7ec52a5e0e5a784a31695e02ece42543260186aa25c658368331c06c12794d4b4
+AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
+AUX exabgp.tmpfiles 136 BLAKE2B ce33ebfb296c6dcb30345b2a4c67f052fc5862ccb28d5cee3d63f45456e34bc72559dad53da4f8a919607522a8c49fc88acf30101b9250d712089c2b0e3a9b22 SHA512 1f191e043e29dc10ba6cf83adb9bbdcc4d9ac3b9e8c7b5d93424578f18d8142b21382218c9ff9fb86607172c52ece2e6aea5ce49a96b4f512663c840cb328540
+DIST exabgp-3.4.28.tar.gz 546611 BLAKE2B c4916fd903fe8853e99ba872d87dc97908546c53d34936019c809ffa18761c3044dd7a21aace9bf6e5bb6a2823d2178422b4cdc2e8f65d7be1fda6de2755ae4d SHA512 40edde5262e3033b5fcccf1e6020cce1fe856b6e31420e14166d5e0d636e5f616283827af2cd82946d94a196ef76ed7c5330ac4bebc564329852869f13018403
+DIST exabgp-4.2.7.tar.gz 2931058 BLAKE2B 2c7bf175322a36c800a8a5874b699b01f4c3d4a8712b1f8decb73665cd214c25ccf657909cfef74610e6a5fd1903245bc4da638ac9245b04c6e63d8247d72d50 SHA512 9c53b78e3fc5ff9cef4d267e2cb3509dbcfdd4a3b21d2c7e40a8d873a9ac586b8d5bf860699b6f878cc221af341df140acdf88aaa26a79b0e7865ce7cc607e01
+EBUILD exabgp-3.4.28-r2.ebuild 850 BLAKE2B ee79eef857a6364e4d1748da8ace0bd2e5d21d51f608b6fd0a027fcd7fb16f9f13062feb25826190d09e0f9285ae2c7d68b902bf3df44f1a45ce0041831f907f SHA512 ef8e5f7cdc233bfb4bdf476317fc3021c4796dd0e661a778df24fce72261224a987718ce0b96a6ca44695f8e8f46518bec48069a4d290c33896d18ce1604648a
+EBUILD exabgp-4.2.7-r2.ebuild 1225 BLAKE2B 056734c689ddd191bf4227f71f8af8221b19bb176feb233ea1f8c6515886b9088c8b16c3cb2657a7e6ad4fac627282f349ac20b560fb9671eb6de7f770b44842 SHA512 5204bbdb48d313bae38e74fca9ddf48f1d2e57e7eaabd18943f13abedc4961c2b2ca1ef8335f5b38664aa8bf4910bf7c18c1c28d2827a323c06a403b6e500c1c
+MISC metadata.xml 343 BLAKE2B 306f12e34e1edf8060cdd1515f77040a2b400a9d853b8b46a73b219464947cf3fc1f64efc32bde26074aa61cb483466ea752481876a02cb14c8388787105e61f SHA512 9c4c8e26eb586fa1153b1f02db408cebd9a460c6ceca049fe121977d1a14ec130d9289aca2f0cffee009a5e7f314818eb37b55790c75502817bb2941be7352f6
diff --git a/net-misc/exabgp/exabgp-3.2.17.ebuild b/net-misc/exabgp/exabgp-3.2.17.ebuild
deleted file mode 100644
index 5792e63eb1c2..000000000000
--- a/net-misc/exabgp/exabgp-3.2.17.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${P}.tar.gz"
-MY_P="${PN}-${PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/net-misc/exabgp/exabgp-3.4.26-r1.ebuild b/net-misc/exabgp/exabgp-3.4.26-r1.ebuild
deleted file mode 100644
index c0a9b4043dbc..000000000000
--- a/net-misc/exabgp/exabgp-3.4.26-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/net-misc/exabgp/exabgp-3.4.28-r2.ebuild b/net-misc/exabgp/exabgp-3.4.28-r2.ebuild
new file mode 100644
index 000000000000..f6753117ebc7
--- /dev/null
+++ b/net-misc/exabgp/exabgp-3.4.28-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit tmpfiles systemd distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/exabgp
+	acct-user/exabgp
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
+	systemd_dounit etc/systemd/*
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	keepdir /etc/exabgp
+}
diff --git a/net-misc/exabgp/exabgp-4.0.10.ebuild b/net-misc/exabgp/exabgp-4.0.10.ebuild
deleted file mode 100644
index 3a13ef59ecf4..000000000000
--- a/net-misc/exabgp/exabgp-4.0.10.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/net-misc/exabgp/exabgp-4.2.7-r2.ebuild b/net-misc/exabgp/exabgp-4.2.7-r2.ebuild
new file mode 100644
index 000000000000..bdcff317c204
--- /dev/null
+++ b/net-misc/exabgp/exabgp-4.2.7-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit tmpfiles systemd distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/exabgp
+	acct-user/exabgp
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/exabgp-4.2.7-paths.patch"
+)
+
+python_test() {
+	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
+	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
+	systemd_dounit etc/systemd/*
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	keepdir /etc/exabgp
+}
diff --git a/net-misc/exabgp/files/exabgp-4.2.7-paths.patch b/net-misc/exabgp/files/exabgp-4.2.7-paths.patch
new file mode 100644
index 000000000000..0744a00d6939
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.7-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 58d47087..a4266d05 100644
+--- a/setup.py
++++ b/setup.py
+@@ -31,7 +31,7 @@ def filesOf(directory):
+
+
+ data_files = [
+-    ('etc/exabgp/examples', filesOf('etc/exabgp')),
++    ('share/exabgp/examples', filesOf('etc/exabgp')),
+ ]
+
+ if platform.system() != 'NetBSD':
diff --git a/net-misc/exabgp/files/exabgp.confd b/net-misc/exabgp/files/exabgp.confd
new file mode 100644
index 000000000000..2586be12393d
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp.confd
@@ -0,0 +1,10 @@
+# /etc/conf.d/exabgp
+
+# arguments to pass to exabgp
+#EXABGP_ARGS="/etc/exabgp/exabgp.conf"
+
+# user to run exabgp as
+#EXABGP_USER=exabgp
+
+# group to run exabgp as
+#EXABGP_GROUP=exabgp
diff --git a/net-misc/exabgp/files/exabgp.initd b/net-misc/exabgp/files/exabgp.initd
new file mode 100644
index 000000000000..e220108d8262
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp.initd
@@ -0,0 +1,59 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# default arguments
+: "${EXABGP_ARGS:=--env=/etc/${RC_SVCNAME}/exabgp.env /etc/${RC_SVCNAME}/exabgp.conf}"
+
+command="capsh"
+command_args="
+	--uid=${EXABGP_USER:-exabgp}
+	--gid=${EXABGP_GROUP:-exabgp}
+	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
+	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
+command_background="yes"
+pidfile="/run/exabgp/${RC_SVCNAME}.pid"
+start_stop_daemon_args="
+	--stdout /var/log/${RC_SVCNAME}/exabgp.log
+	--stderr /var/log/${RC_SVCNAME}/exabgp.log"
+extra_started_commands="routes sessions"
+extra_commands="checkconfig"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
+		/run/exabgp || return
+
+	checkpath -q -p -m 0600 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
+		/run/exabgp/${RC_SVCNAME}.{in,out} || return
+
+	checkconfig || return
+}
+
+stop_pre() {
+	# don't restart if the configuration is bad
+	if [ "${RC_CMD}" = restart ]; then
+		checkconfig || return
+	fi
+}
+
+checkconfig() {
+	ebegin "Checking configuration for ${RC_SVCNAME}"
+	exabgp -t ${EXABGP_ARGS}
+	eend ${?} "Invalid configuration"
+}
+
+sessions() {
+	ebegin "Querying sessions"
+	exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show neighbor summary
+	eend ${?} "exabgpcli failed"
+}
+
+routes() {
+	ebegin "Querying routes"
+	exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show adj-rib out
+	eend ${?} "exabgpcli failed"
+}
diff --git a/net-misc/exabgp/files/exabgp.logrotate b/net-misc/exabgp/files/exabgp.logrotate
new file mode 100644
index 000000000000..0616196211ac
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp.logrotate
@@ -0,0 +1,5 @@
+/var/log/exabgp/*.log {
+	missingok
+	compress
+	copytruncate
+}
diff --git a/net-misc/exabgp/files/exabgp.tmpfiles b/net-misc/exabgp/files/exabgp.tmpfiles
new file mode 100644
index 000000000000..80720cbfc1f7
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp.tmpfiles
@@ -0,0 +1,3 @@
+f	/run/exabgp			0755	exabgp	exabgp	-	-
+p	/run/exabgp/exabgp.in		0600	exabgp	exabgp	-	-
+p	/run/exabgp/exabgp.out		0600	exabgp	exabgp	-	-
diff --git a/net-misc/exabgp/metadata.xml b/net-misc/exabgp/metadata.xml
index 019082130680..e7e80d6c3fa8 100644
--- a/net-misc/exabgp/metadata.xml
+++ b/net-misc/exabgp/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
   </maintainer>
   <upstream>
     <remote-id type="github">Exa-Networks/exabgp</remote-id>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 5424706184d1..56b2b37896aa 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,8 +1,7 @@
-AUX 2.0.0-backports.patch 3717 BLAKE2B a80d2fd291f4a2c94253cc41b50610b0f6116181853fd8ca07c88b17c816156f69a168347633651b23bdd8e6d65e583e03d1f7f8e9d8d26e04daee34a165506e SHA512 e8fab560145ed73d28aaeb93cbf8ada68a76ab7ee3e0cbb9f65f157a935a1c312bc6e9c188e4bca83b1e64d00af93fa39b9ab0d1fdb558936aa2d2b0738155a5
-DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
-DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b
-EBUILD freerdp-2.0.0-r1.ebuild 2942 BLAKE2B 0f2aa9737cfd68caf4012beb385e25ac6464fc067eb40ebeb2f3c2196183c192cb85f1d92e2947f1a5555d9d280d68e8b960dd9bbc50105472003df97c62f758 SHA512 0a4e542307b57033c840d8e0b2c59b2befae7dc732e82f58e4af13fe56088efe01459f09315487e53d3c0aea55cde722a13e4e44efd804de19a8b5fc3b69c692
+DIST freerdp-2.1.0.tar.gz 6869116 BLAKE2B c9cab4b571b288450efa5c5666f8cb64ca9e37dfd342d5e66c256b0fca151b20b3f9b1027a12f8fe9cbae186d95c8cb4d28c90deeadcacc3c158f50a3e713747 SHA512 86d72419d012c52a3dfa071d50bac96ddb3a1423bf35252fdef72676f8b2830b65c9e0511dea2d7b9a69e7783a3d1eacbd2f868b08836742dec7542c77a39405
+DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd SHA512 6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b
 EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
+EBUILD freerdp-2.1.1.ebuild 2841 BLAKE2B 293de05f1b826d2cc47bb44c526cc0b970508d78696e3adbdccaf7246367c0ef8ed7af0eac8da87951109655009c4b713c9a22f96bb8a146738dcefb96fe3b73 SHA512 8d63380fd33e2712bc19e0198bb301dca159ab70a978d04b65a1d2e8546f98b6397fece095c7853da05ebf51116566c2a3cd09e883ab7fa0b1b5407bbc337f6f
 EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
-MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
+MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/files/2.0.0-backports.patch b/net-misc/freerdp/files/2.0.0-backports.patch
deleted file mode 100644
index a1cf36539fd4..000000000000
--- a/net-misc/freerdp/files/2.0.0-backports.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 42d40261c58307508299deae58a75ef08d14283d Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Fri, 10 Apr 2020 14:11:15 +0200
-Subject: [PATCH] Fixed return type for subsystem entry
-
----
- channels/client/CMakeLists.txt                 | 2 +-
- channels/client/tables.h                       | 2 +-
- channels/urbdrc/client/libusb/libusb_udevman.c | 6 +++---
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
-index a0d3a73581..eb0c80f129 100644
---- a/channels/client/CMakeLists.txt
-+++ b/channels/client/CMakeLists.txt
-@@ -97,7 +97,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
- 			set(STATIC_SUBSYSTEM_ENTRY "${STATIC_SUBSYSTEM_NAME}_freerdp_${STATIC_MODULE_CHANNEL}_client_subsystem_entry")
- 		endif()
- 		set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ \"${STATIC_SUBSYSTEM_NAME}\", \"${STATIC_SUBSYSTEM_TYPE}\", ${STATIC_SUBSYSTEM_ENTRY} },")
--		set(SUBSYSTEM_IMPORT "extern void ${STATIC_SUBSYSTEM_ENTRY}(void);")
-+		set(SUBSYSTEM_IMPORT "extern UINT ${STATIC_SUBSYSTEM_ENTRY}(void*);")
- 		set(CLIENT_STATIC_SUBSYSTEM_IMPORTS "${CLIENT_STATIC_SUBSYSTEM_IMPORTS}\n${SUBSYSTEM_IMPORT}")
- 	endforeach()
- 	set(SUBSYSTEM_TABLE "${SUBSYSTEM_TABLE}\n\t{ NULL, NULL, NULL }\n};")
-diff --git a/channels/client/tables.h b/channels/client/tables.h
-index fd998a6ae1..b6b3f9ca27 100644
---- a/channels/client/tables.h
-+++ b/channels/client/tables.h
-@@ -37,7 +37,7 @@ struct _STATIC_SUBSYSTEM_ENTRY
- {
- 	const char* name;
- 	const char* type;
--	void (*entry)(void);
-+	UINT (*entry)();
- };
- typedef struct _STATIC_SUBSYSTEM_ENTRY STATIC_SUBSYSTEM_ENTRY;
- 
-diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c
-index 67360ad430..7509326c22 100644
---- a/channels/urbdrc/client/libusb/libusb_udevman.c
-+++ b/channels/urbdrc/client/libusb/libusb_udevman.c
-@@ -861,9 +861,9 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
- #else
- #define freerdp_urbdrc_client_subsystem_entry FREERDP_API freerdp_urbdrc_client_subsystem_entry
- #endif
--int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)
-+UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS pEntryPoints)
- {
--	int rc;
-+	UINT rc;
- 	UINT status;
- 	UDEVMAN* udevman;
- 	ADDIN_ARGV* args = pEntryPoints->args;
-@@ -922,5 +922,5 @@ int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p
- 	return 0;
- fail:
- 	udevman_free(&udevman->iface);
--	return -1;
-+	return ERROR_INTERNAL_ERROR;
- }
-From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Fri, 10 Apr 2020 14:16:19 +0200
-Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions
-
----
- channels/urbdrc/client/urbdrc_main.h | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h
-index 5ec839983b..749aaf8727 100644
---- a/channels/urbdrc/client/urbdrc_main.h
-+++ b/channels/urbdrc/client/urbdrc_main.h
-@@ -222,14 +222,12 @@ struct _IUDEVMAN
- 	UINT32 status;
- };
- 
--enum
--{
--	DEVICE_ADD_FLAG_BUS,
--	DEVICE_ADD_FLAG_DEV,
--	DEVICE_ADD_FLAG_VENDOR,
--	DEVICE_ADD_FLAG_PRODUCT,
--	DEVICE_ADD_FLAG_REGISTER
--} device_add_flag_t;
-+#define DEVICE_ADD_FLAG_BUS 0x01
-+#define DEVICE_ADD_FLAG_DEV 0x02
-+#define DEVICE_ADD_FLAG_VENDOR 0x04
-+#define DEVICE_ADD_FLAG_PRODUCT 0x08
-+#define DEVICE_ADD_FLAG_REGISTER 0x10
-+
- #define DEVICE_ADD_FLAG_ALL                                               \
- 	(DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \
- 	 DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER)
diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.1.1.ebuild
index d4c577fb18e5..80ed08a506c6 100644
--- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.1.ebuild
@@ -5,14 +5,16 @@ EAPI=7
 
 inherit cmake
 
-if [[ ${PV} != 9999 ]]; then
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-else
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -20,7 +22,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 libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -29,21 +31,19 @@ RDEPEND="
 	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 )
-		)
+	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? ( media-video/ffmpeg:0= )
 	!ffmpeg? (
@@ -82,23 +82,18 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	client? ( X? ( doc? (
+	X? ( doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
-	) ) )
+	) )
 "
 
-PATCHES=(
-	"${FILESDIR}"/2.0.0-backports.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
 		-DCHANNEL_URBDRC=$(usex usb ON OFF)
 		-DWITH_ALSA=$(usex alsa ON OFF)
 		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
 		-DWITH_CUPS=$(usex cups ON OFF)
 		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
 		-DWITH_MANPAGES=$(usex doc ON OFF)
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index 22b0a0566617..16127826173c 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<use>
-		<flag name="client">Build client binaries</flag>
 		<flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag>
 		<flag name="server">Build server binaries</flag>
 	</use>
diff --git a/net-misc/gns3-converter/Manifest b/net-misc/gns3-converter/Manifest
deleted file mode 100644
index 086d8d50cc1e..000000000000
--- a/net-misc/gns3-converter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gns3-converter-1.3.0.tar.gz 45837 BLAKE2B 9265773c941a0b3a364d912498fb1c7188259c4ebd244d688fe6a7f3a3110892adfb6e045d1f11938aa0f79c72721020a74e9a0bc297f93e44fee2bd7a3e3526 SHA512 ac2e44b3f02c8f0429158e11c964bf342973809139dcf34863071905400964006d7adbc3ddb80efe57a5ecc5eaf59e228bf7d07a7e5776dd6bcf51b4e1d3fe57
-EBUILD gns3-converter-1.3.0.ebuild 507 BLAKE2B 559ea6639d1a787b2baf4180541d3b41d76666e3170d7b67adb01b5872fe60b643340068001cb508a2d28ee4f199615b01e7370a16ebe4025ff2f381016e8b03 SHA512 44329962dc38d396459d498d6128b30c25fd27bfdcc31b60b9d06fea2cc80c806b1d33606fcfbe78cec1e673863aff5626e2baffb9744dc5c4b68c5c29fd33ce
-MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
diff --git a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
deleted file mode 100644
index d455267e6c1b..000000000000
--- a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Designed to convert old ini-style GNS3 topologies"
-HOMEPAGE="https://github.com/dlintott/gns3-converter"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/configobj[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-misc/gns3-converter/metadata.xml b/net-misc/gns3-converter/metadata.xml
deleted file mode 100644
index 019d76c33613..000000000000
--- a/net-misc/gns3-converter/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>onigino@protonmail.com</email>
-		<name>Gino McCarty</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gns-3</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 32e4185de771..151ac11c2543 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,4 @@
-DIST gns3-gui-2.1.21.tar.gz 4845512 BLAKE2B 93af250719a0aafe8645926552c61d43152e5a5620d42b4d73cd58d597b3280d11935043771f15cf04e5d116f6740d929e04c27b1af6732d65b7c6e36313ed3c SHA512 b9b03c59064214323fe7375256075c56368747c8cd273bea41791b101ea7d6b877443e81dd57f13faf4b4bdc6de558e98648770de4734b1edd1c82911f2fcb9b
-EBUILD gns3-gui-2.1.21.ebuild 911 BLAKE2B 9295057c120516022ed4e9fd03e66eb0eb82c754f6fc4d8da8028a5c180a3765833a65b6814873b5394ad0da6659300a4979cf653269e04af371a762d170cffc SHA512 b74a0ab797c8a2b9959db94d301e0bd06b7b3c12aacf7f4e6d98a41616c5ff194d2e3f203f8517e011c75c61ba8eaf8ad5ea387ec432a687c69a52fdee0a40f2
-MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
+AUX gns3-gui-rmraven.patch 7920 BLAKE2B d6264938eae55de6754c187f63bbb96707e8e0f68f1aa7153d8101aec5d81e46d3ad145a16f1694b358467c6a4586478c21112126b797e4b76e3ab549636dfdd SHA512 a47c9445caf185624aaec8834ed0884b588b07c34481e09b3f0be3ae5a9643f0a925eefb816d03617c072fe8d239307376715c6028345b6f498a98a41c3bcc51
+DIST gns3-gui-2.2.8.tar.gz 5237129 BLAKE2B ce72219a1d0201f596c20b0988ab81f280889d3eb4717898da5d1a3c52a248e8f1d020d83b900309e623fadb758e67a91baaac9d61d75e72b96f4144ac5101fb SHA512 28b9f6f16506f206f64831160d95687525b6709d9d0d84623763e46c3c9b2e138e3f12844619bbad00491677818a7e28da4f4ea9358d063c3427db16e62775ca
+EBUILD gns3-gui-2.2.8.ebuild 1482 BLAKE2B 2c26d13df5bb66e112a4bab8d20a13db417029682c4cfebf2f736f65b1c61404834c19197c18789f87f2edc81a25d887c8ef07d26edc3df8c027dd5aec5b0e17 SHA512 c65c0214d019ed7c28bc64dfa71326d2edf4bf28f0b59a91bf6b6e3ab1fe1948ff8ea68332aaa6849f53cff4488e507532cb35b23d7aa374447b15c3c05923f8
+MISC metadata.xml 438 BLAKE2B ec1fc3f214034f6e467ed725c2972189fbc3598793d19584e2a84aa3f9fb12f566ee137b5bc1eaf2cd4442e21665a0b7cdfba9aaaf03557db0c1cd6bb3d126c7 SHA512 b58e19104628f98516f3cca55dff685ac66e3c96a51ee17a4ccf976a149bead74ac2eeb20b4f81e5da16a83b30af9bd5998a1e131c52709e576955e07fd85035
diff --git a/net-misc/gns3-gui/files/gns3-gui-rmraven.patch b/net-misc/gns3-gui/files/gns3-gui-rmraven.patch
new file mode 100644
index 000000000000..9a8be4e62495
--- /dev/null
+++ b/net-misc/gns3-gui/files/gns3-gui-rmraven.patch
@@ -0,0 +1,182 @@
+From 2ea1946c0f83672f5289edcce207a8d2de03cc43 Mon Sep 17 00:00:00 2001
+From: grossmj <grossmj@gns3.net>
+Date: Tue, 19 May 2020 15:48:53 +0930
+Subject: [PATCH] Replace Raven by Sentry SDK. Fixes
+ https://github.com/GNS3/gns3-server/issues/1758
+
+---
+ gns3/crash_report.py | 111 +++++++++++++++++++++++++------------------
+ requirements.txt     |   2 +-
+ 2 files changed, 66 insertions(+), 47 deletions(-)
+
+diff --git a/gns3/crash_report.py b/gns3/crash_report.py
+index a6a555fd5..dfbb9fc46 100644
+--- a/gns3/crash_report.py
++++ b/gns3/crash_report.py
+@@ -23,12 +23,11 @@
+ import distro
+ 
+ try:
+-    import raven
+-    from raven.transport.http import HTTPTransport
+-    RAVEN_AVAILABLE = True
++    import sentry_sdk
++    SENTRY_SDK_AVAILABLE = True
+ except ImportError:
+-    # raven is not installed with deb package in order to simplify packaging
+-    RAVEN_AVAILABLE = False
++    # Sentry SDK is not installed with deb package in order to simplify packaging
++    SENTRY_SDK_AVAILABLE = False
+ 
+ from .utils.get_resource import get_resource
+ from .version import __version__, __version_info__
+@@ -69,49 +68,50 @@ def __init__(self):
+         sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
+         sentry_uncaught.disabled = True
+ 
+-    def captureException(self, exception, value, tb):
+-        from .local_server import LocalServer
+-        from .local_config import LocalConfig
+-        from .controller import Controller
+-        from .compute_manager import ComputeManager
+-
+-        local_server = LocalServer.instance().localServerSettings()
+-        if local_server["report_errors"]:
+-            if not RAVEN_AVAILABLE:
+-                return
+-
+-            if os.path.exists(LocalConfig.instance().runAsRootPath()):
+-                log.warning("User has run application as root. Crash reports are disabled.")
+-                sys.exit(1)
+-                return
++        if SENTRY_SDK_AVAILABLE:
++            cacert = None
++            if hasattr(sys, "frozen"):
++                cacert_resource = get_resource("cacert.pem")
++                if cacert_resource is not None and os.path.isfile(cacert_resource):
++                    cacert = cacert_resource
++                else:
++                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
+ 
+-            if os.path.exists(".git"):
+-                log.warning("A .git directory exist crash report is turn off for developers. Instant exit")
+-                sys.exit(1)
+-                return
++            sentry_sdk.init(dsn=CrashReport.DSN,
++                            release=__version__,
++                            ca_certs=cacert)
+ 
+-            if hasattr(exception, "fingerprint"):
+-                client = raven.Client(CrashReport.DSN, release=__version__, fingerprint=['{{ default }}', exception.fingerprint], transport=HTTPTransport)
+-            else:
+-                client = raven.Client(CrashReport.DSN, release=__version__, transport=HTTPTransport)
+-            context = {
++            tags = {
+                 "os:name": platform.system(),
+                 "os:release": platform.release(),
+                 "os:win_32": " ".join(platform.win32_ver()),
+                 "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
+                 "os:linux": " ".join(distro.linux_distribution()),
++
++            }
++
++            self._add_qt_information(tags)
++
++            with sentry_sdk.configure_scope() as scope:
++                for key, value in tags.items():
++                    scope.set_tag(key, value)
++
++            extra_context = {
+                 "python:version": "{}.{}.{}".format(sys.version_info[0],
+                                                     sys.version_info[1],
+                                                     sys.version_info[2]),
+                 "python:bit": struct.calcsize("P") * 8,
+                 "python:encoding": sys.getdefaultencoding(),
+-                "python:frozen": "{}".format(hasattr(sys, "frozen")),
++                "python:frozen": "{}".format(hasattr(sys, "frozen"))
+             }
+ 
+             # extra controller and compute information
+-            extra_context = {"controller:version": Controller.instance().version(),
+-                             "controller:host": Controller.instance().host(),
+-                             "controller:connected": Controller.instance().connected()}
++            from .controller import Controller
++            from .compute_manager import ComputeManager
++            extra_context["controller:version"] = Controller.instance().version()
++            extra_context["controller:host"] = Controller.instance().host()
++            extra_context["controller:connected"] = Controller.instance().connected()
++
+             for index, compute in enumerate(ComputeManager.instance().computes()):
+                 extra_context["compute{}:id".format(index)] = compute.id()
+                 extra_context["compute{}:name".format(index)] = compute.name(),
+@@ -120,27 +120,46 @@ def captureException(self, exception, value, tb):
+                 extra_context["compute{}:platform".format(index)] = compute.capabilities().get("platform")
+                 extra_context["compute{}:version".format(index)] = compute.capabilities().get("version")
+ 
+-            context = self._add_qt_information(context)
+-            client.tags_context(context)
+-            client.extra_context(extra_context)
++            with sentry_sdk.configure_scope() as scope:
++                for key, value in extra_context.items():
++                    scope.set_extra(key, value)
++
++    def captureException(self, exception, value, tb):
++        from .local_server import LocalServer
++        from .local_config import LocalConfig
++
++        local_server = LocalServer.instance().localServerSettings()
++        if local_server["report_errors"]:
++            if not SENTRY_SDK_AVAILABLE:
++                return
++
++            if os.path.exists(LocalConfig.instance().runAsRootPath()):
++                log.warning("User is running application as root. Crash reports disabled.")
++                sys.exit(1)
++                return
++
++            if os.path.exists(".git"):
++                log.warning("A .git directory exists, crash reporting is turned off for developers.")
++                sys.exit(1)
++                return
++
+             try:
+-                report = client.captureException((exception, value, tb))
++                sentry_sdk.capture_exception((exception, value, tb))
++                log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
+             except Exception as e:
+                 log.error("Can't send crash report to Sentry: {}".format(e))
+-                return
+-            log.debug("Crash report sent with event ID: {}".format(client.get_ident(report)))
+ 
+-    def _add_qt_information(self, context):
++    def _add_qt_information(self, tags):
++
+         try:
+             from .qt import QtCore
+             from .qt import sip
+         except ImportError:
+-            return context
+-        context["psutil:version"] = psutil.__version__
+-        context["pyqt:version"] = QtCore.PYQT_VERSION_STR
+-        context["qt:version"] = QtCore.QT_VERSION_STR
+-        context["sip:version"] = sip.SIP_VERSION_STR
+-        return context
++            return tags
++        tags["pyqt:version"] = QtCore.PYQT_VERSION_STR
++        tags["qt:version"] = QtCore.QT_VERSION_STR
++        tags["sip:version"] = sip.SIP_VERSION_STR
++        return tags
+ 
+     @classmethod
+     def instance(cls):
+diff --git a/requirements.txt b/requirements.txt
+index 99e803f1b..abd6cc7c9 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,5 +1,5 @@
+ jsonschema==3.2.0; python_version >= '3.8'  # pyup: ignore
+ jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
+-raven>=5.23.0
++sentry-sdk>=0.14.4
+ psutil==5.6.6
+ distro>=1.3.0
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
deleted file mode 100644
index 941d10b41d49..000000000000
--- a/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 desktop
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="http://www.gns3.net/"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-#net-misc/gns3-server version should always match gns3-gui version
-
-RDEPEND="
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-2.2.1[${PYTHON_USEDEP}]
-	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
-}
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.8.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.8.ebuild
new file mode 100644
index 000000000000..5494cff0bb34
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 desktop xdg
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="https://www.gns3.net/"
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#net-misc/gns3-server version should always match gns3-gui version
+RDEPEND="
+	>=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/jsonschema-3.2.0:=[${PYTHON_USEDEP}]' 'python3_8')
+	$(python_gen_cond_dep '<=dev-python/jsonschema-2.6.0:=[${PYTHON_USEDEP}]' 'python3_7')
+	>=dev-python/psutil-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
+"
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+PATCHES=( "${FILESDIR}/gns3-gui-rmraven.patch" )
+
+src_prepare() {
+	default
+	# newer psutils is fine
+	sed -i -e '/psutil==5.6.6/d' requirements.txt || die "fixing requirements failed"
+	eapply_user
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 019d76c33613..09439c8762b5 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/metadata.xml
@@ -2,14 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>onigino@protonmail.com</email>
-		<name>Gino McCarty</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
+		<remote-id type="github">GNS3/gns3-server</remote-id>
+		<bugs-to>https://github.com/GNS3/gns3-server/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index fdf1dc403e52..19237ad4d3b7 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,3 +1,4 @@
-DIST gns3-server-2.1.21.tar.gz 1713993 BLAKE2B 719306e05fd86b22b7413a60eb6fccc0d16a25cc3a34850344124433d0871bce5e85b195386615c1eaebf083295775de4031eee93c477bb8bd07078b839b2ee1 SHA512 3aeb7609f0fad3cf239a4de24affb124b5bed4a3af78c6a6e287a1b771e206c476849a04cf4ab731ce4923ca072d66928068fec5720bc0eb81d6819ed63f71c8
-EBUILD gns3-server-2.1.21.ebuild 1847 BLAKE2B 5cdb83591ec5de58891ee16042dc62947e5cdcbe510d19ac23b2242a473aa092fbf0897ac5b110d2f553febe263706ed0ef4538265adb744984ccefff21230cf SHA512 e83d1c9a44ca0ea70547809d04e4021c1ec7190ff5e5ddb9c58e1ed1cfe756016a9c82897239ae4e1c01a18a3d0284b5588c6fda62dc7f3297c091fc96c08c3a
-MISC metadata.xml 562 BLAKE2B ceb6caa8dcb6c506ad0834282075e35a399502c1c4f1c6886223c886d1405f93718439332ede39f1c18ecd169a61af862a128af9ddb6453ef3dce176de9835f2 SHA512 e2113aa60bffff0f9499d300dcd39799f4d096eedd9e2b6212573e4c64bd997d7df1c36c4f68e0d40ac900d59dbec79f44ff34289421b2a9179442e0f06f626c
+AUX gns3-server-rmraven.patch 7946 BLAKE2B 910366f4552ce3984cef20b88d5fb3a6233d02294d4921a068e5175e9b305dc6d60349c9362e6d09a959aa5eef615a1793363e8965e5711f33b15c981a3b192c SHA512 94af9d532ad6c90c23360240ab15f439cbdfbd95c870c76e0f71b5178d8a24058a18be088a98f9e3cc731f186cfb12c5fc501da32b0a514b7d66c98fdc0b58c3
+DIST gns3-server-2.2.8.tar.gz 11248484 BLAKE2B 14843a86c0348b92e9c54af5c966f46249f72ef9aa74fc8cda27f3209d00d2e129df98c75f301d8fe2046fb1c04f3e24e163adbead787fed2c1d364c50228902 SHA512 3394d368c986ce8378739bdbc15359c46bdf787a38e18bae9035653dd6dc6683973bf1b7952137189f57fd83074f3d5ea6040f5d7a1d0503f6cf21d2835cd693
+EBUILD gns3-server-2.2.8.ebuild 2387 BLAKE2B 2210e958dc4dca5fcb290e329c1e6f77bb6a426ede1ef6e204be31904e0833c8c56033eb750bc674e36e54b06041da62b0753d8f71534e0e1b1768a4a29a57f6 SHA512 001cbee2614da65679d8e7c45dd007fc864fe346e90d4c7fbeb6061596a759e8439b54b10353f1bc37e9a81d28e2353d6f16e7fa25fba0b7db243563030e744f
+MISC metadata.xml 438 BLAKE2B ec1fc3f214034f6e467ed725c2972189fbc3598793d19584e2a84aa3f9fb12f566ee137b5bc1eaf2cd4442e21665a0b7cdfba9aaaf03557db0c1cd6bb3d126c7 SHA512 b58e19104628f98516f3cca55dff685ac66e3c96a51ee17a4ccf976a149bead74ac2eeb20b4f81e5da16a83b30af9bd5998a1e131c52709e576955e07fd85035
diff --git a/net-misc/gns3-server/files/gns3-server-rmraven.patch b/net-misc/gns3-server/files/gns3-server-rmraven.patch
new file mode 100644
index 000000000000..612a16aecaee
--- /dev/null
+++ b/net-misc/gns3-server/files/gns3-server-rmraven.patch
@@ -0,0 +1,194 @@
+From c63aad8eca00bca2ec48fcb667bbdfd80a22a7ab Mon Sep 17 00:00:00 2001
+From: grossmj <grossmj@gns3.net>
+Date: Tue, 19 May 2020 15:48:53 +0930
+Subject: [PATCH] Replace Raven by Sentry SDK. Fixes
+ https://github.com/GNS3/gns3-server/issues/1758
+
+---
+ gns3server/crash_report.py | 93 ++++++++++++++++++++------------------
+ gns3server/web/route.py    |  2 +-
+ requirements.txt           |  3 +-
+ 3 files changed, 53 insertions(+), 45 deletions(-)
+
+diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py
+index 87e22a213..7f92d38e6 100644
+--- a/gns3server/crash_report.py
++++ b/gns3server/crash_report.py
+@@ -15,22 +15,21 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++try:
++    import sentry_sdk
++    from sentry_sdk.integrations.aiohttp import AioHttpIntegration
++    SENTRY_SDK_AVAILABLE = True
++except ImportError:
++    # Sentry SDK is not installed with deb package in order to simplify packaging
++    SENTRY_SDK_AVAILABLE = False
++
+ import os
+ import sys
+ import struct
+-import aiohttp
+ import platform
+ import locale
+ import distro
+ 
+-try:
+-    import raven
+-    from raven.transport.http import HTTPTransport
+-    RAVEN_AVAILABLE = True
+-except ImportError:
+-    # raven is not installed with deb package in order to simplify packaging
+-    RAVEN_AVAILABLE = False
+-
+ from .version import __version__, __version_info__
+ from .config import Config
+ from .utils.get_resource import get_resource
+@@ -59,48 +58,45 @@ class CrashReport:
+     """
+ 
+     DSN = "https://dbfb677c73304b1286aef33dfbb749c6:93b9a937d4884426a1b15f37536fcd94@o19455.ingest.sentry.io/38482"
+-    if hasattr(sys, "frozen"):
+-        cacert = get_resource("cacert.pem")
+-        if cacert is not None and os.path.isfile(cacert):
+-            DSN += "?ca_certs={}".format(cacert)
+-        else:
+-            log.warning("The SSL certificate bundle file '{}' could not be found".format(cacert))
+     _instance = None
+ 
+     def __init__(self):
+-        self._client = None
+ 
+-        # We don't want sentry making noise if an error is catched when you don't have internet
++        # We don't want sentry making noise if an error is caught when you don't have internet
+         sentry_errors = logging.getLogger('sentry.errors')
+         sentry_errors.disabled = True
+ 
+         sentry_uncaught = logging.getLogger('sentry.errors.uncaught')
+         sentry_uncaught.disabled = True
+ 
+-    def capture_exception(self, request=None):
+-        if not RAVEN_AVAILABLE:
+-            return
+-        if os.path.exists(".git"):
+-            log.warning("A .git directory exist crash report is turn off for developers")
+-            return
+-        server_config = Config.instance().get_section_config("Server")
+-        if server_config.getboolean("report_errors"):
+-            if self._client is None:
+-                self._client = raven.Client(CrashReport.DSN, release=__version__, raise_send_errors=True, transport=HTTPTransport)
+-            if request is not None:
+-                self._client.http_context({
+-                    "method": request.method,
+-                    "url": request.path,
+-                    "data": request.json,
+-                })
+-
+-            context = {
++        if SENTRY_SDK_AVAILABLE:
++            cacert = None
++            if hasattr(sys, "frozen"):
++                cacert_resource = get_resource("cacert.pem")
++                if cacert_resource is not None and os.path.isfile(cacert_resource):
++                    cacert = cacert_resource
++                else:
++                    log.error("The SSL certificate bundle file '{}' could not be found".format(cacert_resource))
++
++            sentry_sdk.init(dsn=CrashReport.DSN,
++                            release=__version__,
++                            ca_certs=cacert,
++                            integrations=[AioHttpIntegration()])
++
++            tags = {
+                 "os:name": platform.system(),
+                 "os:release": platform.release(),
+                 "os:win_32": " ".join(platform.win32_ver()),
+                 "os:mac": "{} {}".format(platform.mac_ver()[0], platform.mac_ver()[2]),
+                 "os:linux": " ".join(distro.linux_distribution()),
+-                "aiohttp:version": aiohttp.__version__,
++
++            }
++
++            with sentry_sdk.configure_scope() as scope:
++                for key, value in tags.items():
++                    scope.set_tag(key, value)
++
++            extra_context = {
+                 "python:version": "{}.{}.{}".format(sys.version_info[0],
+                                                     sys.version_info[1],
+                                                     sys.version_info[2]),
+@@ -113,8 +109,8 @@ def capture_exception(self, request=None):
+                 # add locale information
+                 try:
+                     language, encoding = locale.getlocale()
+-                    context["locale:language"] = language
+-                    context["locale:encoding"] = encoding
++                    extra_context["locale:language"] = language
++                    extra_context["locale:encoding"] = encoding
+                 except ValueError:
+                     pass
+ 
+@@ -124,17 +120,28 @@ def capture_exception(self, request=None):
+                 if os.path.isfile(gns3vm_version):
+                     try:
+                         with open(gns3vm_version) as fd:
+-                            context["gns3vm:version"] = fd.readline().strip()
++                            extra_context["gns3vm:version"] = fd.readline().strip()
+                     except OSError:
+                         pass
+ 
+-            self._client.tags_context(context)
++            with sentry_sdk.configure_scope() as scope:
++                for key, value in extra_context.items():
++                    scope.set_extra(key, value)
++
++    def capture_exception(self):
++        if not SENTRY_SDK_AVAILABLE:
++            return
++        if os.path.exists(".git"):
++            log.warning(".git directory detected, crash reporting is turned off for developers.")
++            return
++        server_config = Config.instance().get_section_config("Server")
++        if server_config.getboolean("report_errors"):
++
+             try:
+-                report = self._client.captureException()
++                sentry_sdk.capture_exception()
++                log.info("Crash report sent with event ID: {}".format(sentry_sdk.last_event_id()))
+             except Exception as e:
+                 log.error("Can't send crash report to Sentry: {}".format(e))
+-                return
+-            log.info("Crash report sent with event ID: {}".format(self._client.get_ident(report)))
+ 
+     @classmethod
+     def instance(cls):
+diff --git a/gns3server/web/route.py b/gns3server/web/route.py
+index d1275250d..c70dbbc3a 100644
+--- a/gns3server/web/route.py
++++ b/gns3server/web/route.py
+@@ -242,7 +242,7 @@ async def control_schema(request):
+                     log.error("Uncaught exception detected: {type}".format(type=type(e)), exc_info=1)
+                     response = Response(request=request, route=route)
+                     response.set_status(500)
+-                    CrashReport.instance().capture_exception(request)
++                    CrashReport.instance().capture_exception()
+                     exc_type, exc_value, exc_tb = sys.exc_info()
+                     lines = traceback.format_exception(exc_type, exc_value, exc_tb)
+                     if api_version is not None:
+diff --git a/requirements.txt b/requirements.txt
+index 57fbb7938..0af9e0d68 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -4,9 +4,10 @@ jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
+ aiohttp==3.6.2
+ aiohttp-cors==0.7.0
+ aiofiles==0.4.0
++aiocontextvars==0.2.2
+ async_generator>=1.10
+ Jinja2>=2.7.3
+-raven>=5.23.0
++sentry-sdk>=0.14.4
+ psutil==5.6.6
+ async-timeout==3.0.1
+ distro>=1.3.0
diff --git a/net-misc/gns3-server/gns3-server-2.1.21.ebuild b/net-misc/gns3-server/gns3-server-2.2.8.ebuild
index 473d48502085..ed01d69a2653 100644
--- a/net-misc/gns3-server/gns3-server-2.1.21.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.8.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="http://www.gns3.net/"
+HOMEPAGE="https://www.gns3.net/"
 SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
@@ -15,29 +15,41 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	>=dev-python/aiohttp-2.3.3[${PYTHON_USEDEP}]
-	<dev-python/aiohttp-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.6.0[${PYTHON_USEDEP}]
-	sys-apps/busybox
-	<dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
 	>=app-emulation/dynamips-0.2.18
+	>=dev-python/aiofiles-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-cors-0.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/async_generator-1.10[${PYTHON_USEDEP}]
+	>=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
-	>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/jsonschema-3.2.0:=[${PYTHON_USEDEP}]' 'python3_8')
+	$(python_gen_cond_dep '<=dev-python/jsonschema-2.6.0:=[${PYTHON_USEDEP}]' 'python3_7')
+	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+	dev-python/py-cpuinfo[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
 	>=net-misc/ubridge-0.9.14
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/gns3-server-rmraven.patch" )
+
 src_prepare() {
 	default
 
+	# newer psutils is fine
+	sed -i -e '/psutil==5.6.6/d' requirements.txt || die "fixing requirements failed"
+
+	# We don't support <py3.7
+	sed -i -e '/aiocontextvars==0.2.2/d' requirements.txt || die "fixing requirements failed"
+	sed -i -e '/yarl==1.3.0/d' requirements.txt || die "fixing requirements failed 2"
+
 	#Remove Pre-built busybox binary
 	rm gns3server/compute/docker/resources/bin/busybox || die
+
 	# Package installs 'tests' package which is forbidden
 	rm -rf tests || die
+	eapply_user
 }
 
 python_install() {
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index e4aa7df0de5a..09439c8762b5 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>onigino@protonmail.com</email>
-		<name>Gino McCarty</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index 39d4be2c5219..e805867a8094 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,3 +1,5 @@
+DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
+EBUILD grive-0.5.1.ebuild 756 BLAKE2B e2d3f071ea93435ba19516baa1a138d6312f794133a8ce4edb811dd601daf7e129e73c13345c843d9a5c0af9346351d5c70df775a16d572f42c02913b8f82a77 SHA512 9e9c1fd7d8c34de9615f6a93af74caad6dbb5fe632ad4417aa7571a683099a3c3b8cb40dd984d6e57e2ca29473780e9bd0c3080c6c9cf6a569af68c1e179de08
 EBUILD grive-0.5.1_pre20171005.ebuild 810 BLAKE2B 75622d38abc90cb36ac0625bc113a4ae3e1841768d0392e24d45ffacd06c593ad96d4b366fad8f22d725eafa2bbb7324c9851f507c7af30660ec06202c1694f9 SHA512 d29f8d4cb9b1775b600469592378b0785de1dcc8a6afba3e142d95e47a8b3064576d1c2cd070f13b7fd9d14e0c668d2ebd67b9c153df91ba23036ba25379cd66
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/grive-0.5.1.ebuild b/net-misc/grive/grive-0.5.1.ebuild
new file mode 100644
index 000000000000..04bfdf1b8e05
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	dev-libs/yajl
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index c37bc2a3dbdf..33a425022be4 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -2,5 +2,7 @@ AUX igmpproxy.confd 199 BLAKE2B 85902275ecd501bb26f37c91cf135cb34efd8dab8a6b5d85
 AUX igmpproxy.initd-r1 337 BLAKE2B 44af8071177be905593ea867b23be08a9b51928158f62c7d62bbae33b59edd23c3b873db29f38eac37c42a9385c223e050fb3ed1e8776472f9fb73533d73200e SHA512 1e4e5d73fe9a734ab7898c2defdef8f9b27c3811109ef8819875a65733c72e48feb683d0001ced759c3195ce30bf31c6af9be7cebf30dd1dcd9141ffbbfe3f53
 AUX igmpproxy.service 155 BLAKE2B 7cddd2b54bc632b16ec7ac28665dd752d5e8090741adff7da2d9085b30d7cdd8428d4525bf0ebeabd99663a246a86e45d0958792e04f52e3f798996a5dcabd74 SHA512 e50a6ba9c29e49ff243f3704033a3f4b1167281e6b8270de324a8f8f2646ff063fac0ef90d19196dbf4c8b39e2474e831f1ac2ac35f1a6b85e83e3f9f3d319be
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
+DIST igmpproxy-0.2.1_p20200508.tar.gz 43672 BLAKE2B 886e293a30ec8b0a6bdfee9a7858d6de67b42e71628a604b108909f7eac31cfb129648f6eb8c47cf6aeec4d0a078f5a7a0f4487737b4f9338f727445a4f94dac SHA512 f0929537cac30664ed94231b2b31098dccea53a3e0d5ddfc14ae5ab08fa116438a983d06c17f41d8fec69b94d0c8725eb23525c94813d78310f2f2e3c03bcbf7
 EBUILD igmpproxy-0.2.1-r2.ebuild 602 BLAKE2B a5bef105ee2271b1801692825cb60274a498f91122d684e893ff0f487e3a07ecb6e9d6edf6c1326ae85c4ad178f9a4407e37944470b314561800177f2c5e3afb SHA512 964d744d22b1fcd627c0db393a11e4d5fc088ad442f783735078bac8cc06747dce7480c717e0e429ea4224fb5ff6dc58f0f3faa7cd840a79c581ab6a13e492fc
+EBUILD igmpproxy-0.2.1_p20200508.ebuild 754 BLAKE2B 661ba0bcbf2a1e075a4c2f5bdea5dd1fc28e041b63955ccb81b506e4484ca4702a83d7bb3dfaefb2545af5a6bb74afafc210fb0b18b58b03bf113ffd48788da2 SHA512 1654dbe8aa96b9068ee8b5df201919ba5c4ae50bfd8aaa8725eafbf4f83bb1627df63d79ffbcc17a628affdaedf00dc2d604524c6f9b817ae1703d24f9fd9ad1
 MISC metadata.xml 593 BLAKE2B 29de61191b267e0b01464e3cd66e5d1b68deb0feba50b2ae1facb2909a04dbe56e8fb1b9188028bb11ba8fade7f750927e9cc24e2f47bf071fb775a4366deec9 SHA512 326ef6823232e5e8a11e173024a759d969ab190fa3c406063c8f59cdd1a6c33cbe3e1e4c070605e298d7bd3ec4d92c446edcc17dcc3c76660f9391235c1a4721
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild
new file mode 100644
index 000000000000..e9a6c7141374
--- /dev/null
+++ b/net-misc/igmpproxy/igmpproxy-0.2.1_p20200508.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="c3e813a077c26134aa7574b4b271a5ee3d781471"
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
+HOMEPAGE="https://github.com/pali/igmpproxy"
+SRC_URI="https://github.com/pali/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/igmpproxy.initd-r1 igmpproxy
+	systemd_dounit "${FILESDIR}"/"${PN}".service
+
+	newconfd "${FILESDIR}"/igmpproxy.confd igmpproxy
+}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 3bbdbf522dee..6a373af0fc9d 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.7.6.tar.gz 7362882 BLAKE2B 09b508f1f3b025c4e732f67f78757b7617e82453319348bc8550d6035331cb51347233057872085e967c6ad3fca56046c21eb64da77beef23039ea61512c4fc6 SHA512 5f48dc8fa60c9e8614237b27a5eff2857854e2878397c5d9cbb388abc94f35aedecedf696582b7ba4dbcd79c38c42af6557e013d5a9db4756d6e525af279287a
 DIST kea-1.7.7.tar.gz 7391670 BLAKE2B 0a0cc58d74de5b0729c4e684d79e271d122ec689c623f72ae1f8b6f631bea99ec7416721f406a5dc54ec0132c090f8a7583818d0ec4e1a9507fc5c1bc13014b6 SHA512 af65a7aff9c06fe078df5ed72737b0bc537dc1cc790f0e32449b73642ee7b4b582cc30cfe37283eed66fe2617eae22d5b48c3991d0e53d83b99327ccc17f63c1
-EBUILD kea-1.7.6.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
+DIST kea-1.7.8.tar.gz 7443616 BLAKE2B 88de7f0ffb0cf9b594eabf6520c6d1b16d1e94524ae12087e9cd119aa1d6396f250c2f6d77fdc8d87cf46f892f26054625be083d4e4e5bfecc498092e9146c2f SHA512 1bed7a20f0ee2198eb6c196cf6895217fecea1a8274d155d669bf30ac1aab795917e7537d279bad55c951c3c99a7cd7cf9a86594bf6f7a689d1f694823353a28
 EBUILD kea-1.7.7.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
+EBUILD kea-1.7.8.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
 EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.7.6.ebuild b/net-misc/kea/kea-1.7.8.ebuild
index 2f6a4dc21e8a..2f6a4dc21e8a 100644
--- a/net-misc/kea/kea-1.7.6.ebuild
+++ b/net-misc/kea/kea-1.7.8.ebuild
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 115e4925fa08..38a28fdb6fbd 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -2,6 +2,7 @@ AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d0007
 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
 AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf
+AUX lldpd-1.0.5-cpp.patch 617 BLAKE2B 71a520303bbde126425f6e1432407d5cc6b4f363c74a3019761433a58fdbe404e9d90836c7fce1d8caef428fa0eb874739fc1115458f8ec7a403e275311987bd SHA512 16b7669e7f0fc6403d79121db056cbd5fe2cf892aa8a23c64b5253266164fcea27cc559b8deca8a0af7e1e3b5b0baa289302e46f057fe781f3ba0f6c7042171b
 AUX lldpd-1.0.5-seccomp.patch 2282 BLAKE2B 6a3cd06b65576c4f2c54636778a628960104980d3bf0b05f4164b0062c7604fb694517457f0ad13a4b83086de5219b23ca7a795b7cfb16b2baf15680e5ad7036 SHA512 6818b88d17cab0b924a3f145ce82c24ee9e3ae6a450b82413f5979cd51fb1b58fe51a9fa98e5225e0f4229bf227a029abba5f02636319b74b01394e5723ddb95
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
@@ -13,5 +14,5 @@ DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04
 DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
 EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff
 EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663
-EBUILD lldpd-1.0.5-r1.ebuild 2321 BLAKE2B 8f5aa4915393eab19f0e7dc7e58a6f1bebe708da47ad22bddaffb77bec21f37d6bf14b159d1bfc737bbedc2495a6d8cd35f606bd29f931ae1882b1125af2fee2 SHA512 ac9a808768aede243e3d7a14b9739b31a0097598428e6ed2b5c63506125b856f92d383f1be0e577f5bcbb8791427658a3917a592e54510aa985b4210a8ab4801
+EBUILD lldpd-1.0.5-r1.ebuild 2358 BLAKE2B 7c4ce6ad02ec5850536efce7e0b32b93766a3741a896dcf796871c823d1f0b44670ff0e537c5164d5e01144165b60a65e30bb3b160991b4c6bdbc1c82a580929 SHA512 ca685b258e2912fd2c01847f506305d9ed6f0357b46157a17c5fd76112396fecf74bd6f1409b8d234f859fb2e31bbbe6757e536c1991c4a013c53d59d0bae5af
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
new file mode 100644
index 000000000000..0c3fc1964d40
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.5-cpp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
+index 0d5f2f3..cc41a8a 100644
+--- a/src/daemon/Makefile.am
++++ b/src/daemon/Makefile.am
+@@ -108,7 +108,7 @@ CLEANFILES    += syscall-names.h
+ syscall-names.h:
+ 	$(AM_V_GEN)
+ 	$(AM_V_at)echo "static const char *syscall_names[] = {" > $@ ;\
+-	echo "#include <sys/syscall.h>" | cpp -dM | grep '^#define __NR_' | \
++	echo "#include <sys/syscall.h>" | $(CPP) -dM | grep '^#define __NR_' | \
+ 		LC_ALL=C sed -r -n -e 's/^\#define[ \t]+__NR_([a-z0-9_]+)[ \t]+([0-9]+)(.*)/ [\2] = "\1",/p' >> $@ ;\
+ 	echo "};" >> $@
+ nodist_liblldpd_la_SOURCES += syscall-names.h
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
index bdb15ea083d9..8a440b4d037b 100644
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="graph? ( doc )"
 
 PATCHES=(
 	"${FILESDIR}/lldpd-1.0.5-seccomp.patch"
+	"${FILESDIR}/lldpd-1.0.5-cpp.patch"
 )
 
 src_prepare() {
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index 277a4b21a374..42db48ec2149 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,3 +1,3 @@
 DIST megatools-1.10.3.tar.gz 196361 BLAKE2B 49d7658714074253ab93134bd9fbb6f73a9101e362f219c4394cfe599deeb3cb2ccf01afb89db75691299271fa9dbfdf004abd6dfe26d2a0fda783282561ff51 SHA512 cf431e151f3f7e1a77fcfe07092694f861eca43ab88bb4e0d4de72f01662e9140c51891f8f5cf3cf66d3a04b64a55d57fd766c3febf2fc5cee1720558ff2079b
-EBUILD megatools-1.10.3.ebuild 704 BLAKE2B 6caa5dcdbcbb7b576fdf073e5625a3875fd1443734e578dd272ae1ff3a850a75402fc050e410e5bf9a4b22ded4864c637207ac12f1ac440ec7796fcb90cd73b7 SHA512 1326592bd307dca3b8a0f68bd56426ac2ed230d220835761d6bdd28ee6f9c35148211d2ea15d02055ff2bc82c829add29daf70b4c3ad9b4f6ad4ac7391606c09
+EBUILD megatools-1.10.3.ebuild 763 BLAKE2B 8f0fadf26889cb323e4b0e660d97ff1c5861e2cc1a361b38f58406bd5a3618728fe39dbeeb7eb716c340879223b85752a536b8897e1de2eaa99553b16b03664e SHA512 84a6d76d4c20384805105b165626445b0da1335a42491098bc7542f2e12e4129509f409832e380dc179225d12608ac9de424cdbbdc59e209dc89ec2758a08c97
 MISC metadata.xml 531 BLAKE2B cc1cb4fb594ec4ad7a48eb547e2d15a3f060b000596f81dcafc23d0ae50ee1a979a18f65747ace522ebaa315ecb863697280f09e9bccf01c4c695ccbf29b76ce SHA512 b6dba0febd0344a6bf61a64809b60cc67ed3ebbc48a363206ac5c86547f6da6cbf573e3e55734f6f966820ba01654109e9e0535a5434e62c461fb87866bb6c8f
diff --git a/net-misc/megatools/megatools-1.10.3.ebuild b/net-misc/megatools/megatools-1.10.3.ebuild
index 577aa496b79c..f963f80749fb 100644
--- a/net-misc/megatools/megatools-1.10.3.ebuild
+++ b/net-misc/megatools/megatools-1.10.3.ebuild
@@ -27,6 +27,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	default
+	sed -i -e "/^AC_PROG_CC/ a AM_PROG_AR" configure.ac || die
 	eautoreconf
 }
 
@@ -35,5 +36,4 @@ src_configure() {
 	econf \
 		--disable-maintainer-mode \
 		--disable-warnings
-
 }
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 79cd3a7096af..fd7b7be5201f 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -15,6 +15,6 @@ DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e
 EBUILD ntpsec-1.1.4.ebuild 4119 BLAKE2B 944627f2d6cd0f9c0a83d6258d857a63d66832115ca3ebbbf72d3d4bb9f4d2857df26cde6650d4d8a8f1eb2d0a04d0b2e0188640729b991e2e5059a8283e6bdb SHA512 2ef78287947e9c6a59d17be67bd15049f14f266beb8733295de0f532ac30c6e39088a5888ca0029443582201d9f3ccb44cf2e52202f84547ef8c52cf3063f6e7
 EBUILD ntpsec-1.1.6.ebuild 4077 BLAKE2B 24f82c887bdd8d2f5cdac4580d5803629cac818b91168d0bf205562419c399f664b4fc1264c6f88ef8d0fd167f66f4cb6fc343a1220032ec65729e9ca721dd11 SHA512 082e35dc0322737d9077deb8cb240d011d0d74d90b612e8a4d60c5d08f672c4c2f195f15ba8bd8c9dca01e67e769b1d1941534bb12242b7808123d539837eae4
 EBUILD ntpsec-1.1.7-r1.ebuild 4170 BLAKE2B 830f468ccc34883d9606155d68a46e0ad5182414de78b0a6754edac475bc19b383be80c1ca79b2b0ade771ff66fe52e4643f5cb3f3243dd2d02e6c7865648676 SHA512 eb7e62f61a523a1af060957ba74d7bd8e7705230aa0597570e478191c18d586d8bd92b89e3a5f9d59de77e5f456a05e0ceb32a37012e9a3c1d803358d731ab8c
-EBUILD ntpsec-1.1.8.ebuild 4361 BLAKE2B b347f6c6d8ba5266c2be0f88ff08a32008843c1147bb3cdac066ddf7e5ec28d201d7092f3e391edbb9c8cc59964f82148377a1398ada715f64db4e1dc143405e SHA512 7aa6666fd37bfdfdcacd8ebe7849c976b88fd91b712885673384b2922cf96dc212b40c69892371a1831e3805579174986915a364cdc5f668e97b9c8cc9cc0c79
+EBUILD ntpsec-1.1.8.ebuild 4368 BLAKE2B 90410cda8d74701a66155f39566efdf647e62493ba7c1bb3e209c8d28ead2ca940118759769dd7f70b332d959ff5555abe3f50c2e84cb07b7c7c16ed8463b69e SHA512 c7f39cf40833679033943a501a751b2282f0123fca5b897e0b0805ab5b17d3c427d4b4a915e1e00a966574dabfa3da445978a4dfaacb9a71b66ebec8bbaee02a
 EBUILD ntpsec-9999.ebuild 4105 BLAKE2B 3acb680474e27deb351ea4fdb0cea659995103c7f7f3ffe2670851b551ee7567d98b5db094cfadc56fdbf551296d37074d6747f5cedbcfd700801ee7e04ed2e3 SHA512 4f35b54362bbb6eba38e93ba05d725cf5a8b5fa0bcaa4f9a4a0b15537b1e0939450ba1b23892a9a6b19c1fee74454d1f50af7ff4025761fbd36dedd6eeb3c48f
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
index 22989ca4d482..9da748d10037 100644
--- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
@@ -12,12 +12,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS=""
+	KEYWORDS="amd64 arm"
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
 	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index aec0434bc753..1b9814a04852 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -21,6 +21,7 @@ AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea63
 AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe
 AUX openssh-8.2_p1-hpn-14.20-libressl.patch 794 BLAKE2B 36e42916a90aeb857eb7b9bc815a2720b4fad82ebcb1b53b7045f5c61f1dadfcdb4478092c5ab514d0d11832696cbb54acc18c01e5daa41eea776962065f7467 SHA512 d41e48a70f6b3b293c07f42f764dea810ed3084e54821004f97e2e5fbc1ce7110e68632fd3492779b1ec62179a3f7e34e92554c735f825952e0ce1a05fd9d474
 AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde
+AUX openssh-8.3_p1-hpn-14.20-glue.patch 6059 BLAKE2B 454178571fbf051fad6edff93c87d96f4fa62c687b03666a27e912e29c9f11d375935d0f830edff779ff73f0de16831bc54d2a7e747ff5e3951933b25f39b452 SHA512 0791c0936b4e316715e691b3ac0fa6dd03495fc30ddb68ba15a73c2f8aafb3892df5fa3c29d91e16d956f9aa3c9fd66ded8ad744834788f2fad08b807efe0a5b
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -38,10 +39,13 @@ DIST openssh-8.2p1+x509-12.4.2.diff.gz 805574 BLAKE2B 4df31b634308ce074d820df249
 DIST openssh-8.2p1+x509-12.4.3.diff.gz 806905 BLAKE2B 8e0f0f3eeb2aafd9fc9e6eca80c0b51ffedbed9dfc46ff73bb1becd28f6ac013407d03107b59da05d9d56edbf283eef20891086867b79efd8aab81c3e9a4a32f SHA512 51117d7e4df2ff78c4fdfd08c2bb8f1739b1db064df65bab3872e1a956c277a4736c511794aa399061058fea666a76ee07bb50d83a0d077b7fa572d02c030b91
 DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305
 DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a
+DIST openssh-8.3p1-sctp-1.2.patch.xz 7668 BLAKE2B abbc65253d842c09a04811bdbafc175c5226996cdd190812b47ce9646853cd5c1b21d733e719b481cce9c7f4dc00894b6d6be732e311850963df23b9dc55a0e6 SHA512 4e0cc1707663f902dfbf331a431325da78759cc757a4aaae33e0c7f64f21830ec805168d8ae4d47a65a20c235fa534679e288f922df2b24655b7d1ee9a3bf014
+DIST openssh-8.3p1.tar.gz 1706358 BLAKE2B 0b53d92caa4a0f4cb40eee671ac889753d320b7c8e44df159a81dd8163c3663f07fa648f5dc506fb27d31893acf9701b997598c50bf204acf54172d72825a4d8 SHA512 b5232f7c85bf59ae2ff9d17b030117012e257e3b8c0d5ac60bb139a85b1fbf298b40f2e04203a2e13ca7273053ed668b9dedd54d3a67a7cb8e8e58c0228c5f40
 DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221
 DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1877acdedeaee80172da469b5a62d0aaa43d6ed46c578e7893577b9d563835d89ca2044867fc561ad3f562bf504c025cf4c78421cf3d24397e9 SHA512 768db7cca8839df4441afcb08457d13d32625b31859da527c3d7f1a92d17a4ec81d6987db00879c394bbe59589e57b10bfd98899a167ffed65ab367b1fd08739
 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d
 EBUILD openssh-8.1_p1-r3.ebuild 16430 BLAKE2B 5f87ff43f472c467a8e4dc359556b970a2d9889d45d5eb09c5eac5c0d245027764ec4d6b99853baaf7324883e5be426e20515b53f48fcc7a445a05e84fb0edde SHA512 e07cf259d7a6476c5efa4db22710bd533f86188bd1f5139e2c306858dd67e3b2a83cf5c9236c9441171e25af20a14e9f1d04aa058020ac9a20e0b0d6e7d8d89d
 EBUILD openssh-8.2_p1-r5.ebuild 16798 BLAKE2B 03dd8a663c89cb2185188a0fa9f72af49def3f44a9eaaa989c95f8b2812aab7a335547ff9d22edf64522576a04705e1f957d0edfe2ecf397df760f077eb846c5 SHA512 2a1714d7c8fa18a7b3bf5333625773e2125ca21dd3096766aad341663510503276db61fa42b9cc99d0531b4fcc55ae81e31c47de7502f7c2d83bdb49b91f1448
 EBUILD openssh-8.2_p1-r6.ebuild 16856 BLAKE2B f2e13e4cf7dd8f5fa5413bf66fb78116c27dc578b3a1f3368e288b26aea5a90d3e19f8a347e79d460935123169c95583c379c9db1ed352af54ed34991d02ad43 SHA512 e9bf2cda73df7d5b5a38e0ef9ce907a9be9fdeeb871e47d80809773e4119664dd42277f0d8016f4e77ae486750540c52fbdf0712fdecbac919b282a25d1e493c
+EBUILD openssh-8.3_p1.ebuild 17135 BLAKE2B 0ab8330635d38428b4137e4d00c440e3d71a4c41c86fd304af8897f97ab588a540617e5629e0c85f2438d3e029c17bd996e307c137f10548938a61a079b3786d SHA512 efc956eadbcb38ea05542008b33a2505297c586a93ed591612def790a17d28e4edcedc114ca2dde26924577b4deb562ed316c5ecd54d2c404aa45ab03a023bae
 MISC metadata.xml 2009 BLAKE2B de9bc08ceda797610a3910f79fc382a40c3129fec66b65675e008c649f8dd7341ef12b4391136e0e0d036699ed98fe23d7b3def941cb26cd299a17408e469830 SHA512 b72696b307f01cfe3b4ccf746450fbd15d0e64436fe7668c936c1f902522df68218314d494254d8e5403dcb1ffc79a52e64212b6c49b0e464754875112048544
diff --git a/net-misc/openssh/files/openssh-8.3_p1-hpn-14.20-glue.patch b/net-misc/openssh/files/openssh-8.3_p1-hpn-14.20-glue.patch
new file mode 100644
index 000000000000..4414f9be5331
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.3_p1-hpn-14.20-glue.patch
@@ -0,0 +1,177 @@
+Only in b: .openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff.un~
+diff -ur a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
+--- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-05-27 13:52:27.704108928 -0700
++++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-05-27 13:52:49.803967500 -0700
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -42,7 +42,7 @@ CC=@CC@
+- LD=@LD@
+- CFLAGS=@CFLAGS@
++ CFLAGS_NOPIE=@CFLAGS_NOPIE@
+  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ PICFLAG=@PICFLAG@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -902,14 +902,14 @@
+  
+  /*
+ @@ -2118,6 +2125,8 @@ fill_default_options(Options * options)
++ 		options->canonicalize_hostname = SSH_CANONICALISE_NO;
++ 	if (options->fingerprint_hash == -1)
+  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
+- 	if (options->update_hostkeys == -1)
+- 		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+- 
+- 	/* Expand KEX name lists */
+- 	all_cipher = cipher_alg_list(',', 0);
++ #ifdef ENABLE_SK_INTERNAL
++ 	if (options->sk_provider == NULL)
++ 		options->sk_provider = xstrdup("internal");
+ diff --git a/readconf.h b/readconf.h
+ index 8e36bf32..c803eca7 100644
+ --- a/readconf.h
+@@ -952,9 +952,9 @@
+  	sPort, sHostKeyFile, sLoginGraceTime,
+  	sPermitRootLogin, sLogFacility, sLogLevel,
+ @@ -643,6 +647,7 @@ static struct {
+- 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
++ 	{ "include", sInclude, SSHCFG_ALL },
+ +	{ "disableMTAES", sDisableMTAES, SSHCFG_ALL },
+  	{ "ipqos", sIPQoS, SSHCFG_ALL },
+  	{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },
+diff -ur a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
+--- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-05-27 13:52:27.705108921 -0700
++++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-05-27 14:03:57.888683100 -0700
+@@ -409,18 +409,10 @@
+ index 817da43b..b2bcf78f 100644
+ --- a/packet.c
+ +++ b/packet.c
+-@@ -925,6 +925,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -925,6 +925,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -434,20 +426,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -951,6 +969,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/packet.h b/packet.h
+ index 8ccfd2e0..1ad9bc06 100644
+ --- a/packet.h
+@@ -476,9 +454,9 @@
+  /* Format of the configuration file:
+  
+ @@ -167,6 +168,8 @@ typedef enum {
+- 	oHashKnownHosts,
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
++ 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -615,9 +593,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -112,7 +116,10 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -700,9 +678,9 @@
+ +			options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
+ +	}
+ +
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+  	if (options->ip_qos_interactive == -1)
+- 		options->ip_qos_interactive = IPTOS_DSCP_AF21;
+- 	if (options->ip_qos_bulk == -1)
+ @@ -486,6 +532,8 @@ typedef enum {
+  	sPasswordAuthentication, sKbdInteractiveAuthentication,
+  	sListenAddress, sAddressFamily,
+@@ -731,11 +709,10 @@
+  			*flags = keywords[i].flags;
+  			return keywords[i].opcode;
+  		}
+-@@ -1424,10 +1477,27 @@ process_server_config_line(ServerOptions *options, char *line,
+- 		multistate_ptr = multistate_flag;
++@@ -1424,12 +1477,28 @@ process_server_config_line(ServerOptions *options, char *line,
++ 		multistate_ptr = multistate_ignore_rhosts;
+  		goto parse_multistate;
+  
+-+
+ +	case sTcpRcvBufPoll:
+ +		intptr = &options->tcp_rcv_buf_poll;
+ +		goto parse_flag;
+@@ -750,7 +727,9 @@
+ +
+  	case sIgnoreUserKnownHosts:
+  		intptr = &options->ignore_user_known_hosts;
+- 		goto parse_flag;
++  parse_flag:
++ 		multistate_ptr = multistate_flag;
++ 		goto parse_multistate;
+  
+ +	case sNoneEnabled:
+ +		intptr = &options->none_enabled;
+@@ -1079,11 +1058,11 @@
+  	xxx_host = host;
+  	xxx_hostaddr = hostaddr;
+  
+-@@ -422,6 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
++@@ -422,7 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
+  
+  	if (!authctxt.success)
+  		fatal("Authentication failed.");
+-+
++ 
+ +	/*
+ +	 * If the user wants to use the none cipher, do it post authentication
+ +	 * and only if the right conditions are met -- both of the NONE commands
+@@ -1105,9 +1084,9 @@
+ +		}
+ +	}
+ +
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+- 
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
++ 		/* if we are using aes-ctr there can be issues in either a fork or sandbox
+ diff --git a/sshd.c b/sshd.c
+ index 11571c01..23a06022 100644
+ --- a/sshd.c
diff --git a/net-misc/openssh/openssh-8.3_p1.ebuild b/net-misc/openssh/openssh-8.3_p1.ebuild
new file mode 100644
index 000000000000..8238b501a1ae
--- /dev/null
+++ b/net-misc/openssh/openssh-8.3_p1.ebuild
@@ -0,0 +1,492 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+# PV to USE for HPN patches
+#HPN_PV="${PV^^}"
+HPN_PV="8.1_P1"
+
+HPN_VER="14.20"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+#X509_VER="12.4.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+"
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp !security-key ssl !xmss )
+	xmss? ( || ( ssl libressl ) )
+	test? ( ssl )
+"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.4.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( !prefix? ( sys-apps/shadow ) )
+	X? ( x11-apps/xauth )
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf
+"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
+		eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-libressl.patch
+		if use X509; then
+		#	einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
+		#	# X509 and AES-CTR-MT don't get along, let's just drop it
+		#	rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die
+			eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch
+		fi
+		use sctp && eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-sctp-glue.patch
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with security-key security-key-builtin)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	# stackprotect is broken on musl x86 and ppc
+	use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect )
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \
+			SUDO="" SSH_SK_PROVIDER="" \
+			TEST_SSH_UNSAFE_PERMISSIONS=1 \
+			emake -k -j1 ${t} </dev/null \
+				&& passed+=( "${t}" ) \
+				|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 72f134648437..0b7291efa185 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -2,5 +2,5 @@ AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe1561866
 DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a
 DIST r8168-8.048.02.tar.bz2 109232 BLAKE2B 24c04cd0e47fce427ef7de1a2e41e384fd7c0d8dd028715411cc6f47901b703c824dd9c15bc0ed90f649520bd5fd25dbd48cdc37f94ca8f838a07faa99c8aa84 SHA512 d9d828e4717d2857bd38e8c9b9005de19387419db9bc8d174f5c8a8ea120c81c3094770b164a1f92cec7833696d7a1302332ef473c5852146fff5dbf9a69196e
 EBUILD r8168-8.048.00.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76
-EBUILD r8168-8.048.02.ebuild 967 BLAKE2B 8205840245cf8b8cec33f205cf896114d51c5e86b7e391e4a7bcb1060f70636ab3aa77c5d80032207998dfdf1062a76d67cf23037e67fa266854833ca3f2eb92 SHA512 2f96f9a428e24dbe0240417e0889a3555ebe7404d5d0705c45bfa6078ca2b0c04b83e66a58b4f395bfeaa5ad8cfb7456472b289cfe4de1216f19030d2dfb9543
+EBUILD r8168-8.048.02.ebuild 966 BLAKE2B 5de1e783e73c113f06735475035d7cb61918ef6a0522a970d9c3f01d48ce9e6519d136cf9f1ce7a13543a3f73eb82905008f5497323c82bd6b80317754a9688c SHA512 d092a193b6ee1faed1ed99d21e8a268717078c47700a8033e29241259b303a6f3441aecf03b56727569779c4a3f71528545aa01dc99746164090cb757bc7362d
 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/r8168-8.048.02.ebuild b/net-misc/r8168/r8168-8.048.02.ebuild
index 299ab1010e46..2496884f96e0 100644
--- a/net-misc/r8168/r8168-8.048.02.ebuild
+++ b/net-misc/r8168/r8168-8.048.02.ebuild
@@ -8,7 +8,7 @@ inherit linux-info linux-mod
 DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
 
-# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link,
+# "GBE Ethernet LINUX driver r8168 for kernel up to 5.6" from above link,
 # we need to mirror it to avoid users from needing to fill a captcha to
 # download
 SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 18ce9fa2ac16..c47e833559fb 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -8,10 +8,12 @@ DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55
 DIST rabbitmq-server-3.7.24.tar.xz 2867964 BLAKE2B 30d49a72f92a9adc4fe7de071e9369cb4d574249b1d414b2e5d492585ae0bc0e5f85ca0c287d73dbf661df4cb249f29d1bfccc7516e6ec5d6ff70a437a01ce00 SHA512 5bf2b69b555ddc89415ce7918d0ab23221d383742fc20036f608b4cf99852fb58b61a5d7616b6357f151e1f16ed660b35d7b54a1c2ea46cf5b4ef67c2d38bd28
 DIST rabbitmq-server-3.8.2.tar.xz 15178744 BLAKE2B 11da75e48415d53f291fffc8fafd89b506e727714e6f9dfce6a0b7c605a0d56bb3b879c779bebbc21f2bc5ada21378f9ed30e6f729c2c71b61ebe00db16eb225 SHA512 ac8cfc002ccbff8cf95c3e5508956cf5622c1c145b730589308ec4ca9173e5efca338829e13aa7dc37db035868dc964ab0e3e0edba15de49c64e18c50247b918
 DIST rabbitmq-server-3.8.3.tar.xz 3304456 BLAKE2B 2ad04a1a8688cbbba71a82d44003f7ad632b26616dae977e8d326316baaaf7b475c4db37777b13aa8cb153373be0f9f85972aac7ad53c299e39615dd032e8ced SHA512 1547e7935ff34be278970c03b176d76e52a6968cc2955dc75fa00d184ed1ba567e095c5a56e0f2f7c868d41281897c53ec6f4baff019e144aa57afe99cd6adaa
+DIST rabbitmq-server-3.8.4.tar.xz 3086216 BLAKE2B c1c22ebca1b66aa210b45b3fccfffd89f3bb9312d37c78362db6d728456c8b7f3a0d787bcd411909509130307faf8457e4a7becb40cbf76ebb1cd1f1b615cce6 SHA512 2dee202b0a39f3d3d4314c4a5ee812d1c2b85225c6cdfc9ddb887285176df8d7009ca4ac8c3ab61cc3a943d32fa7665124dbf51ed18a322a280a3590601f118d
 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.24.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
 EBUILD rabbitmq-server-3.8.2.ebuild 2160 BLAKE2B a3fd5a085ef37088cde4956fb4ab3b0fa595c8a4d004605cdd23415db17ac521b96187971f5d687cdd7767ed1d43dfa78ac845c2f9f5a3e106461461ef694583 SHA512 fad7e1b6606fdf79440994efef5bd5d7fceae456bcc74edd30b1e53ac413112f2ece2c39ccc45e6a1701d8e0529a1b8cb4a50e7a4e491c6568081e513ee03db2
 EBUILD rabbitmq-server-3.8.3.ebuild 2160 BLAKE2B 1ea1fb4a67301f670fc1c256dc2c32ea3f833e0b02adace4a1e34e03a4d5509d9e3e931385697b9dc749e0f24a70974ef0161798743fcef9106f0395c1953717 SHA512 ab51c206eb5d2d9c395aabc016b691784364b2220fea1feacdbf559ba809402491ba5282c513d312f82b897d36ccad9b8e15837bb6ed69d5f2484315b8959786
+EBUILD rabbitmq-server-3.8.4.ebuild 2369 BLAKE2B 729883c5f0e18572e907f5eacf98af095cf1eb58595e5479ef1e943944bf10e03d0ad026205788ead6882926f9b386028c10a7bb4de8acd5cb02a8ce63bea5bd SHA512 ce48169cda8a45b85bbd2e0937133c2c2bd45e03574d1bc8e5ab0e2713652b63fdad553c4370352d7972cedc5b59751bfc34d8a2561eeb6a877fb780b9b8b01d
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
new file mode 100644
index 000000000000..dacf415d4e71
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit 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"
+
+# This is the first release to officially support Erlang 23.
+# There is one remaining known Erlang 23 incompatibility:
+# rabbitmq-diagnostics observer will fail on Erlang 23.
+# This will be addressed in a future release.
+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.8.0
+	<dev-lang/elixir-1.11.0
+	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/include deps/rabbit/priv escript 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}
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index a68d5bd06a31..2d2f7a73f479 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,10 @@
 AUX remmina-gcc10.patch 911 BLAKE2B 4499abeb5b85d1460c4f00596222ad6dafa1bcf4434c2b6cfa3bbd7f0935cfa2a83e17fd42352437c9f82bf6598c36cd435992253101343599d37911557bb6f0 SHA512 4a54f0c98de0c9f24a11ac6cf935fadc7e832bb6a6bf4ff5b95ab0eaf065dd8d54b39f83f7ba6da31f49ee597a33fa1e8ec3efbf019b806b446d99106efd562c
-DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
 DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
-EBUILD remmina-1.3.6-r1.ebuild 2525 BLAKE2B 70a75ecc3ac3d5cfa3bf7a5c1be0d6b79b406260650b0564fde5144772009f95b2fffd67dd2fdb4a79c4d9e08c88d6e12e8f672d64743e189b2ff16212132da9 SHA512 b7dd14b6b009ce3e547c7f3cfd2b973a12673fee1435f299e88d40d8a10789baa81a9777aaffd01cf626e96e46f56a3d5b282cd92ed6e852d204235aeb0fd043
-EBUILD remmina-1.4.3.ebuild 2616 BLAKE2B a59027b02cc4085de4f4adfecb51956a3ad00689fab0e399833626a0cb079e8044dbc46fd2bbec415f99b71267f708c2d926aa159fb4290167d5d36d226b8865 SHA512 842559f4c041ddd1674110eeb3deec1bb83773143d54586d50f679b25d5b189639ac7e87190bedb9586d70651839c7b886493f6daf7b8e8f5b7351a01b4ad3f1
+DIST Remmina-v1.4.4.tar.gz 1786300 BLAKE2B b4e13a34319c74f1fc935b1b72307e1dbc74d868e23f6b626e4477ca1253e52c0ba70270862c8e6e8fbfc8f7591a27b9319c41b398d4e1cf01339eb778a677b3 SHA512 2264a2d0f6ba65fbb46a2a8cc0a5c2ccd2f562e737b03cc393e7bed811d6437e76792ce3ec5013b48c9b068a58cf92081a49d05bd9be6781960e8db7e4569e35
+DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
+EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3
+EBUILD remmina-1.4.4-r1.ebuild 2631 BLAKE2B 5fe6d882585ae87a9eb3f04e9c8029382da45499327825557f4aad7bb20525ecf413e542b9eb2d268825656e83ceea299c2cd7e221e21eb881b84481bb0a33cc SHA512 0920d4da787ca4b45ead56cb7ee92f95764763cd0d9287d50b390ed9810b0909a30da928d2d605528095497d837503acea4a70f69e369075a8797d22b98f959a
+EBUILD remmina-1.4.4-r2.ebuild 2477 BLAKE2B f3e4eb101a87010ceaaf2ac7b717885e122cb16f563135224a0b5215ac780de3ca45b3437eba9a24ee5bcc4cac6b93834ed8d63c8a9e1e6bebbc13a35f242e20 SHA512 8d7a30d2a406edbd9928a75fe749decb593393a6e40e498d1b7fda3bfebaa1592296eb3cc3d43cf767270b32c3b55d5b281908aec8e20a5d2a97af8221acd8b3
+EBUILD remmina-1.4.4.ebuild 2746 BLAKE2B 9a4cae95fa724ad304600fbd7897d821608ded9eec7a06c16ac3088d4178fa27afe5a52bcfa341f6b2c4036ea0df9ff06cdcd59b9fc18261dd91f09b53172472 SHA512 7edc31c28564929821bdb402244bf60025d3f77b73c3d8e0f0c1bb2911f757b5178ec1e09a3e14deac94784ac02f8d83bbc016586f4f87e3839eb7f696678849
+EBUILD remmina-1.4.5.ebuild 2477 BLAKE2B f3e4eb101a87010ceaaf2ac7b717885e122cb16f563135224a0b5215ac780de3ca45b3437eba9a24ee5bcc4cac6b93834ed8d63c8a9e1e6bebbc13a35f242e20 SHA512 8d7a30d2a406edbd9928a75fe749decb593393a6e40e498d1b7fda3bfebaa1592296eb3cc3d43cf767270b32c3b55d5b281908aec8e20a5d2a97af8221acd8b3
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.3.ebuild b/net-misc/remmina/remmina-1.4.3.ebuild
index 8eab2f136627..2daffd642361 100644
--- a/net-misc/remmina/remmina-1.4.3.ebuild
+++ b/net-misc/remmina/remmina-1.4.3.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 cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
 
 CDEPEND="
diff --git a/net-misc/remmina/remmina-1.3.6-r1.ebuild b/net-misc/remmina/remmina-1.4.4-r1.ebuild
index f91b6a6d0e74..1d0d44c06ec1 100644
--- a/net-misc/remmina/remmina-1.3.6-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,8 +13,8 @@ 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
 
 CDEPEND="
 	dev-libs/glib:2
@@ -25,9 +25,11 @@ CDEPEND="
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
+	appindicator? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		<net-misc/freerdp-3
+		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	kwallet? ( kde-frameworks/kwallet )
 	!libressl? ( dev-libs/openssl:0= )
@@ -55,7 +57,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_APPINDICATOR=$(usex appindicator)
 		-DWITH_GCRYPT=$(usex crypt)
 		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_LIBSECRET=$(usex gnome-keyring)
@@ -63,6 +65,7 @@ src_configure() {
 		-DWITH_GETTEXT=$(usex nls)
 		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
 		-DWITH_SPICE=$(usex spice)
 		-DWITH_LIBSSH=$(usex ssh)
 		-DWITH_VTE=$(usex ssh)
diff --git a/net-misc/remmina/remmina-1.4.4-r2.ebuild b/net-misc/remmina/remmina-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..485866aee596
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.4-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils xdg
+
+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="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+DEPEND="
+	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
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		<net-misc/freerdp-3
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex appindicator)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	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]
+}
diff --git a/net-misc/remmina/remmina-1.4.4.ebuild b/net-misc/remmina/remmina-1.4.4.ebuild
new file mode 100644
index 000000000000..7489ced509f8
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.4.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libsodium:=
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		<net-misc/freerdp-3
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[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_prepare() {
+	sed -i -e '/^OnlyShowIn=Unity;$/d' data/desktop/org.remmina.Remmina.desktop.in || die
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex appindicator)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
new file mode 100644
index 000000000000..485866aee596
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils xdg
+
+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="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+
+DEPEND="
+	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
+	appindicator? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
+		<net-misc/freerdp-3
+		cups? ( net-print/cups:= ) )
+	gnome-keyring? ( app-crypt/libsecret )
+	kwallet? ( kde-frameworks/kwallet )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4 )
+	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex appindicator)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	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]
+}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index 6b9dba114ad9..fd7c100ca262 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3
 EBUILD s6-networking-2.3.0.3.ebuild 1627 BLAKE2B 3d7db35321240f1445f904066c3b5d686c7533df0ef5b67c2264374b12f149d67039602e2a9ff4d8ec841c6bc8e91b51e06e06235a3c99abee99f08def666865 SHA512 804818cb31c44e11aa9d9a43c5c1a2f9a62cadd93abc9994d6ff9d77ed1e08dbab56a1940f1d092ec38a160d98bc3147f6583cd093b5f0e16d03dc163b7ef9e9
 EBUILD s6-networking-2.3.0.4.ebuild 1472 BLAKE2B 295b4795452b0f531e4a499346380f61addf9af31597471872ced7930ddde99c94f07accc1456b467333e9acb383493a0c76152b38f28486ad5156113679853d SHA512 88fb58f470a98c77d898dc7fb3d5c1817c319f7c75136aac0428135694186ceef766d2e1fd9371535d6143566f2780a1532159fbdfcb1dbc2e847ad54c20d2e0
 EBUILD s6-networking-2.3.1.1.ebuild 1472 BLAKE2B c660eb7f0c4161a6dd9d7f6fa3744c1bf876858c797b1c7a146253e2d562a21f8ffb1d3543fad14cfcdd5d8706ba3b7e9569f7e81093ae087614f5ef34ff7dcf SHA512 ad13653e8c3441d681555986c2e51eec0b7a3ef7e50f2ee398121d656a047819ee87b65d4142b33894291a6940a3b1f469611c726ff8cb3c27b86ee6a385ff80
-MISC metadata.xml 867 BLAKE2B 977455d49b859300280a7418a4381e2e2a96d20c7f58b6218c46f189726d2663b2a7bf8bdedb54445fce4433fca53b61bbcb26f15985bc82055011e3a8025999 SHA512 88e6118c450411e3d0f5ed386bbcbceb98d811b6b6b17566894fd2c749fb1469cb607adcc64a7b896b36e80ae4120b91cc179fa993789fb4cd5d4c85dba32f98
+MISC metadata.xml 640 BLAKE2B b658892b1a86aa08807ad2c488f6c0540c999d2e996bfe8d4c66fa8eb61fc9bc2c2411664c9d625f1926ca3a3ca951e3c9e58bb345a8b70c4101a87f39eec08f SHA512 755a43469ee11e14b3503200b96b981145b4039fb8eae703ff8bf5e606d21fd2948cddd7f2c42d2793ace18942d261a9796706f704a7ba44f569bae2b7dbda74
diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
index db1fcf0a4b67..97feaaf4d369 100644
--- a/net-misc/s6-networking/metadata.xml
+++ b/net-misc/s6-networking/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>samuel@sholland.org</email>
-		<name>Samuel Holland</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		s6-networking is a suite of small networking utilities for Unix systems.
 		It includes command-line client and server management, TCP access
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index e7622bf35250..43d217f2a769 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -3,8 +3,8 @@ DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f
 DIST seafile-client-7.0.2.tar.gz 2365981 BLAKE2B 9e11d3e2b770f2b85bb55f0108344c1c69e1fb28ea69ea8a5022efc7811f6336a2fee0de4f38981343d7a29270051e292c14f656d7a7b99e0d646d0f3fee9a9b SHA512 3edafb9728eb39e1b2adbcb0526758279599d25020c5303aa6b610aac1296eef0ebe66447f6555c21dbe125aa5ac1d605736359b52f2bd8933187efd04c2e8df
 DIST seafile-client-7.0.4.tar.gz 2357414 BLAKE2B 9c3368d745d30f57b313e9b5351714097403e67519a4582dd5658cb97152f4ad37c32cb9e6f47c13f199c75e9bd42c529ef0d352f363da815f486c90c305779c SHA512 9073df49639045319e971a76eb3769c184617e179694981ad88ddd02382b4ca50ff92c26239757022270e0a0a4115c8b70ca7efeab6ff2dee78e90a7de1bf5a7
 DIST seafile-client-7.0.5.tar.gz 2359779 BLAKE2B 58fa532668859c4413bb931146a58eb51ede7c1faa3ea2a9cafb94be44a8819261570ef16cc9f62f584f9ff483aa0832a63a99bb53380dd9efa4f82d25dea553 SHA512 b79cde3f98ebb1a0cb1035131cf95735f01c63bcb4bb658d5c40c36cdf85705d2c6fd2f7787fbdb3d965a25d60ee98e020e33c4f9423295c7ef1ab36ee5c7c27
-EBUILD seafile-client-6.2.11.ebuild 1088 BLAKE2B 361dd8fba4526094d41d08d91cda65da848a1b8677b94e3de056ec227db0e98bc8a0b41dfb86d652eac7993646ee93b3b3c3c2743bf5bd659b8bc8aaf3d6f544 SHA512 9e01233d8f5d8cbb100f226c844cbe21eb1381d56a99de246c723ad7fb8abfe978ac8efd74714a963b55e9ab41c91ba1d072352cbc95be3c21991fef9e93faf9
-EBUILD seafile-client-7.0.2.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
-EBUILD seafile-client-7.0.4.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
-EBUILD seafile-client-7.0.5.ebuild 1061 BLAKE2B 801d2f5f073c2ee390efaed34c27cd3143862835eae30086ada519638e8c27c0cc1c04de717eb43a67105f3e9c60ac168390f1c62b9101a687fd6b9e8b5a5d80 SHA512 02ef9623d42f3d87541645241d502759d840fc3d78ebf2c9a899146856deeb6c3606f344d72b89ce6dc415471b505384683c6c6efb11044ce3285077cb975661
+EBUILD seafile-client-6.2.11.ebuild 1089 BLAKE2B ab172b2b57637d926129dc403a5ff159ac1ceb8e5f909f340f40bedf5ac006ceb3493f3e7d8a3cbdd3f5d764920c1882b5f6ce04d5e6ae67368e50a93d013f41 SHA512 400b47d792ff9310b0e1bb9ec7db7d3851d368fc5d85127d51cd3cd069215ad9c975d994ead155f0c8815baf524ee96b38a5f30f35b8515c59ecd65d4b5604e5
+EBUILD seafile-client-7.0.2.ebuild 1099 BLAKE2B 0051351914b9f34ccd1c8a178fb09ae6b1d6abc2c7d7fe5ea02c591ef973066ce81377dfdb3219bca2be55a202607d45cedf210f09861f1ec85a91f6c0785ebe SHA512 a5710b1936d123a71106ee966cdf1a6f47f00d2c4c9bc07d9e348cfc6c7539037f95c73212286254f25fa6a46d11c9db98f583a82ca9953caf6bb258bd6ca4f6
+EBUILD seafile-client-7.0.4.ebuild 1099 BLAKE2B 0051351914b9f34ccd1c8a178fb09ae6b1d6abc2c7d7fe5ea02c591ef973066ce81377dfdb3219bca2be55a202607d45cedf210f09861f1ec85a91f6c0785ebe SHA512 a5710b1936d123a71106ee966cdf1a6f47f00d2c4c9bc07d9e348cfc6c7539037f95c73212286254f25fa6a46d11c9db98f583a82ca9953caf6bb258bd6ca4f6
+EBUILD seafile-client-7.0.5.ebuild 1062 BLAKE2B 6554b553c116a436521026bac9e4d5bd45eea8f919dec85b9e55b4e9ff629523d0ae4076c12c94e8f1af135fa314b927d37cc739b571b92c377cc03b18f30f80 SHA512 f6a0e1ca65fb6d673fbbb3beb384b4d689335d65af051de610fa2a7cb8fabeff5d3db2e5a30014dbf911566eeda9b084901dc50c74e72f4adc49008a8a8b5400
 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 77928c949098..391e523a971a 100644
--- a/net-misc/seafile-client/seafile-client-6.2.11.ebuild
+++ b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ https://www.seafile.com/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
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 fa31e1e217d9..b05f5df982c6 100644
--- a/net-misc/seafile-client/seafile-client-7.0.2.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ https://www.seafile.com/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/net-misc/seafile-client/seafile-client-7.0.4.ebuild b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
index fa31e1e217d9..b05f5df982c6 100644
--- a/net-misc/seafile-client/seafile-client-7.0.4.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
-HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ https://www.seafile.com/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/net-misc/seafile-client/seafile-client-7.0.5.ebuild b/net-misc/seafile-client/seafile-client-7.0.5.ebuild
index ca54c9edd03f..c5ac2c442603 100644
--- a/net-misc/seafile-client/seafile-client-7.0.5.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
-HOMEPAGE="http://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 65a8f909bdaa..95518f092ede 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -2,8 +2,8 @@ DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc82
 DIST seafile-7.0.2.tar.gz 698373 BLAKE2B 171ef14253c260d0e1ed9e984219a545bc5c86895fd554223148515feeb8fd2c6f9ab802f0f505ada0ed504def01999cdd254683de6e0d00f77272eb9d491f4b SHA512 f348139662edb061bbb2da534cd099619f23e09b1383cc97a53116c7e1eb5b41e95d61f719a83f3a69d3914e64836baf15900a9597a7b6ddfb8d23f3e362b8cd
 DIST seafile-7.0.4.tar.gz 706114 BLAKE2B 8abcf24b752eac20e2abeb355c79d420c0cadb374e70739be76531e9ecb6cb3428f6d8c0aeaa6cf5638a9dd5e964f9ae72b4933fd379655149790396dfe9ffb8 SHA512 2eefbb928f3082ba8373509c149e4e1fcfe960f10baba227759ed43411d5adeca844f1538609fd1046f22661322c57bbf93ede1fa849a39e50a4af8a3a7febc1
 DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
-EBUILD seafile-6.2.11.ebuild 1055 BLAKE2B 37f40dd27f04b6e422fc55200c1c60ec4e944127b7a24b4923617d7ceda36afacd89cac7aa5fe9ed31cbd35620fd2a5c49acf79c9eaaaadee00cd7b7dee17596 SHA512 e7e1f55163512d3c34c999b7b8c2fea18982306c90ccd4fd130757a6f37077cff30327eb73ea6a7187c30de5e2edad48cdc2a5169198e0ee9217facdd1a8cb70
-EBUILD seafile-7.0.2.ebuild 1056 BLAKE2B bb4f9535adca4ef40ac250e61cc1490bca4aa093c270c5d3a581c4a9347afa3781922cabd0ff41ed5ed9c292aaa83df971fc579e3d894cc9602132d510b29b43 SHA512 0b7c1369f2598bd648f9181c7c9f90ab3718ebc4a960990a8afdc0a1c52c26ca8901dc29abe5ff520ff7ad3b4996e837e02d84860b5b4b5865fab8905e7703f5
-EBUILD seafile-7.0.4.ebuild 1092 BLAKE2B 3849b25793cd8e4499f57e123397f9d28bc521fa1d20f95cb8d1b23a3151348906210445554058da657712cfff26481a216e35472101fbd8bffaa945ff3874a9 SHA512 a083498e1956b51e1af7d7cdd2644e0a80635b26d07915777bf79a62f1a40191944876820dd71ad8ab9fcd3b0f1bb2d622af7e2bba9735dba9c84a1cbb4163e4
-EBUILD seafile-7.0.5-r1.ebuild 1069 BLAKE2B 01fc0d0ea194b0b4ce9376ec3d87c63c9237bad80d151589bd91a650179b4cbd09e5c8e99cf3cd80ba209de5152dd82be4f186052c9ce67e5d43e1f50c75d4e7 SHA512 baf5cdc631e12099493ffd0e65c88988ec0df5897fdc0903a1affbf56cfb1c0455da54e5e61a29e3cfce0eef107b03b8e4aa482d29407a7f2368c72b50b978c0
+EBUILD seafile-6.2.11.ebuild 1056 BLAKE2B 279d62d80210e1112f63b975a032628da3894605f8f42f556ac536ced029bc45286412c8936430c7e72d14ca9ae7433d27e0f2591b8239939cb8b612ba7645a5 SHA512 4d99ce95f6d5eee226d32689bc089e6141b45d55972ee68a6bcec098132c655e15cfcc04b3001503d29c78a3c5b5a3dabe9abc669340222cbc72cb64530cf78b
+EBUILD seafile-7.0.2.ebuild 1057 BLAKE2B 440195844dcbf7b5e5ea800ea1d6a07b051ef2cb744d24a6c7059ea25f29d276649dd06117cf765e9c66e0f3c05788ec4b770c250127b07240566ff9488247d0 SHA512 a2c3e18063f7d01966ae0eb0339a5edbf45b6ca2299b7a95be1b5111d23242abb4f67371299ac76544c223f4fcd7added5039eab6e8d9bb678dbb0c8f3f415ae
+EBUILD seafile-7.0.4.ebuild 1093 BLAKE2B 46879e54739245bd99bc7e0ba179c2d73ed005b4a4dc9e63646dd9e77852f4949165578a6c3805c2b8595ebfdb0008c4a42d033a1cd580d4142be515bf167545 SHA512 7399a6e9da43f618b66d3a1d8fbb608e9c3d318a40abadf28baac63f5a4404b9a44a465ce68cdb21eb85d21ec62a2d332808db59938ef00ada40df50c787f238
+EBUILD seafile-7.0.5-r1.ebuild 1070 BLAKE2B 630903597a5ac4f4ac6f198e4ce2ecdf105f07c9f8f34e98435a7b546decec5db448796b227a3265ef0bb60781b5c5e686244eed355b59b2e6b8299c087a5412 SHA512 4f1008cfee991a89a778ab614d7d08babc38248422a80b22a8ae544008e480f5cf55bd460bba4d66242d9ade3a8b10c2689646d3ec14b2afe46876fcb9cd4b24
 MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
diff --git a/net-misc/seafile/seafile-6.2.11.ebuild b/net-misc/seafile/seafile-6.2.11.ebuild
index 7b750024c87b..341db77f5c47 100644
--- a/net-misc/seafile/seafile-6.2.11.ebuild
+++ b/net-misc/seafile/seafile-6.2.11.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools python-single-r1 vala
 
 DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+HOMEPAGE="https://github.com/haiwen/seafile/ https://www.seafile.com/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
diff --git a/net-misc/seafile/seafile-7.0.2.ebuild b/net-misc/seafile/seafile-7.0.2.ebuild
index e41376502fec..b53b45c8e32c 100644
--- a/net-misc/seafile/seafile-7.0.2.ebuild
+++ b/net-misc/seafile/seafile-7.0.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools python-single-r1 vala
 
 DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+HOMEPAGE="https://github.com/haiwen/seafile/ https://www.seafile.com/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
diff --git a/net-misc/seafile/seafile-7.0.4.ebuild b/net-misc/seafile/seafile-7.0.4.ebuild
index 6434ae64a9e1..367704af6260 100644
--- a/net-misc/seafile/seafile-7.0.4.ebuild
+++ b/net-misc/seafile/seafile-7.0.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=(python3_6)
 inherit autotools python-single-r1 vala
 
 DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+HOMEPAGE="https://github.com/haiwen/seafile/ https://www.seafile.com/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
diff --git a/net-misc/seafile/seafile-7.0.5-r1.ebuild b/net-misc/seafile/seafile-7.0.5-r1.ebuild
index cff364fbb186..10233ae8ba17 100644
--- a/net-misc/seafile/seafile-7.0.5-r1.ebuild
+++ b/net-misc/seafile/seafile-7.0.5-r1.ebuild
@@ -10,7 +10,7 @@ WANT_AUTOMAKE=1.16
 inherit autotools python-single-r1 vala
 
 DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
-HOMEPAGE="http://www.seafile.com/ https://github.com/haiwen/seafile/"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
 SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
diff --git a/net-misc/ssvnc/Manifest b/net-misc/ssvnc/Manifest
deleted file mode 100644
index 39b5d82e5b35..000000000000
--- a/net-misc/ssvnc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX Makefile.libvncauth 140 BLAKE2B 84b119a944ffe6b126fd697d28f96f805a7c7b11311b4b93796694a98bf0f8e54d9e0b9822d675e2446be6082df9db7dc64c75c90dd87a452daf40daa5810ff4 SHA512 7d3a8833afc2169ab6440763680b24550fc16a0c60371e8b9ceb8eca48217638cc5e0beb9bff5d6c65fb81fe0bad77b6eb7b71c81195fa70b8879e45967852be
-AUX Makefile.vncviewer 273 BLAKE2B 2c57e85006e4f2ee8cd81d074deae19aea3ee3fe7c8f8a5f3c4273d17788214c97c40c2b18901fb7748386583a42f343098923d8e17959d089d104feb9bf7af3 SHA512 21104188080d7a3dab83140e7a32ebb8129cbc7af1759d7537802df9943f63af1d6e01df57cc816b96b7a91886607ccfcf86f35ebabb05537dad16a850f8c22d
-AUX ssvnc-1.0.29-build.patch 1087 BLAKE2B 9c568b53d1aee0875e65cbb919fcc0f7a986fe70d81028ed28bbb881ebbba91644cddae92bbc52d3c291d85cb07390b9f38bbb419b6b4e277e6a48850ea3421d SHA512 f0dbbf55f3c37aba66b8b26160e7447c413986bcf9676fcf744c1d53a63c3776a3c25f90a1ad5819f21ff3967151d5c7c44abb15b78898840bc45cb9c2ef5157
-AUX ssvnc-1.0.29-openssl1.1.patch 6990 BLAKE2B c64425b5872cabfcde55b66ac433e734b53724ea0a002b081a7112a24167908fd1c4857c237a2d06fdf80be063450fd9d468dff28df295dcd20411509ad430bd SHA512 460b1f89e571acd61a411ba0653fd8cfa342d8004dbb44b57a1a887cd0abe72804cc9f87c8d9647004b01ba25ce0e5e83eab211f4222a06c8bf583791a97d377
-DIST ssvnc-1.0.29.src.tar.gz 552796 BLAKE2B 3bee980ef85c1a2769933ca0fec7ed7c76b4cbe107d3e0c81ee04fb6a5f4219cd625e948ed4a398b1db4b322498573c63e69f4d88612281b8cace239d1b65f5e SHA512 ea94f8114ee7e44d788ae698dd85ee8633f0dc8e9b86e17062c733e70b4f7c7c45bf68d0ea8d3e6156395777a41e3fbf63cc9425f45db6f6fda940ae2abcd092
-EBUILD ssvnc-1.0.29-r2.ebuild 1381 BLAKE2B 100c6712a2715ffa40ca6a32dc3a6c2ad4c4ecd265f08bbd513f56fec8bbecdc961d0ebdab8623c11053ef642119f60b3f3964d9f54152bf685fa0997333b4f9 SHA512 0123a82de54b93ed72a98adf67e4e248f47e9539d2e2be131f10c6b31e697c1bfd740e3a55ced7953573f7b969832a1fbba8d3a31a455a93a65d373ce13114d5
-MISC metadata.xml 242 BLAKE2B fccb5f5d9a500d3cb05aaee9df21a0ec0421e398c36915139fe871493632c7df070d222a5bc7d06b4451518baab1d0cbeb61ee2c8e909eb796d087ef7b627676 SHA512 ddf123246fb00abd46363ba180b90241b23577c60d7c001c2cbca9c3968dd240e98d8af00f63f3170fc7df9f824e7fd7957b3aafc780530a2c2fefbfd7e5faad
diff --git a/net-misc/ssvnc/files/Makefile.libvncauth b/net-misc/ssvnc/files/Makefile.libvncauth
deleted file mode 100644
index c24ce4663d5d..000000000000
--- a/net-misc/ssvnc/files/Makefile.libvncauth
+++ /dev/null
@@ -1,7 +0,0 @@
-AR ?= ar
-CPPFLAGS += -I. -I../include -D_GNU_SOURCE
-srcs = $(wildcard *.c)
-libvncauth.a: $(srcs:.c=.o)
-	$(AR) rc $@ $^
-clean:
-	rm -f *.[oa]
diff --git a/net-misc/ssvnc/files/Makefile.vncviewer b/net-misc/ssvnc/files/Makefile.vncviewer
deleted file mode 100644
index 4b6e745c697a..000000000000
--- a/net-misc/ssvnc/files/Makefile.vncviewer
+++ /dev/null
@@ -1,8 +0,0 @@
-CFLAGS += -fno-strength-reduce -fno-strict-aliasing
-CPPFLAGS += -I. -I../include -D_GNU_SOURCE -DMITSHM
-LDLIBS += ../libvncauth/libvncauth.a -lz -ljpeg -lXaw -lXmu -lXt -lXext -lX11
-include Makefile.in
-all: vncviewer
-vncviewer: $(SRCS:.c=.o)
-clean:
-	rm -f *.[oa] vncviewer
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch
deleted file mode 100644
index 8d2db6f5cc7f..000000000000
--- a/net-misc/ssvnc/files/ssvnc-1.0.29-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -21,11 +21,11 @@
- 
- # N.B. ?= is gnu make specific.  Some of the subdir Makefiles are too. 
- #
--PREFIX  ?= /usr/local
--ROOT    ?=
-+PREFIX   = /usr
-+ROOT     = $(DESTDIR)
- BIN      = bin
- LIB      = lib/ssvnc
- MAN      = man
--MANDIR  ?= $(MAN)
-+MANDIR   = share/$(MAN)
- APPS    ?= share/applications
- BINNAME ?= ssvncviewer
-@@ -66,7 +66,6 @@
- 
- install: all
- 	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)/man1
--	strip $(VIEWER)
- 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
- 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
- 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
---- a/vncstorepw/Makefile
-+++ b/vncstorepw/Makefile
-@@ -14,7 +14,6 @@
- 
- $(CMD): vncauth.o vncstorepw.o d3des.o
- 	PATH=$$PATH:$(EPATH) $(CC) -o $(CMD) vncstorepw.o vncauth.o d3des.o
--	PATH=$$PATH:$(EPATH) strip $(CMD)
- 	@ls -l $(CMD)
- 
- $(UNWRAP): unwrap.c
-@@ -41,7 +40,6 @@
- 	else \
- 		PATH=$$PATH:$(EPATH) $(CC) -o $(ULTDSM) $(CPP_SSL) ultravnc_dsm_helper.c $(LD_SSL) -lcrypto; \
- 	fi
--	PATH=$$PATH:$(EPATH) strip $(ULTDSM)
- 	@ls -l $(ULTDSM)
- 
- test: $(CMD)
-
diff --git a/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch b/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch
deleted file mode 100644
index 0ee278f9eea3..000000000000
--- a/net-misc/ssvnc/files/ssvnc-1.0.29-openssl1.1.patch
+++ /dev/null
@@ -1,199 +0,0 @@
---- a/vncstorepw/ultravnc_dsm_helper.c
-+++ b/vncstorepw/ultravnc_dsm_helper.c
-@@ -414,7 +414,9 @@ void enc_do(char *ciph, char *keyfile, c
- 		if (strstr(p, "md5+") == p) {
- 			Digest = EVP_md5();        p += strlen("md5+");
- 		} else if (strstr(p, "sha+") == p) {
--			Digest = EVP_sha();        p += strlen("sha+");
-+			fprintf(stderr, "%s: obsolete hash algorithm: SHA-0\n",
-+			    prog, s);
-+			exit(1);
- 		} else if (strstr(p, "sha1+") == p) {
- 			Digest = EVP_sha1();       p += strlen("sha1+");
- 		} else if (strstr(p, "ripe+") == p) {
-@@ -655,8 +657,10 @@ static void enc_xfer(int sock_fr, int so
- 	 */
- 	unsigned char E_keystr[EVP_MAX_KEY_LENGTH];
- 	unsigned char D_keystr[EVP_MAX_KEY_LENGTH];
--	EVP_CIPHER_CTX E_ctx, D_ctx;
--	EVP_CIPHER_CTX *ctx = NULL;
-+	//openssl1.1.patch - Do NOT create two context and only use one
-+	// - that's silly.
-+	//EVP_CIPHER_CTX *E_ctx, *D_ctx;
-+	EVP_CIPHER_CTX *ctx;
- 
- 	unsigned char buf[BSIZE], out[BSIZE];
- 	unsigned char *psrc = NULL, *keystr;
-@@ -698,11 +702,14 @@ static void enc_xfer(int sock_fr, int so
- 	encsym = encrypt ? "+" : "-";
- 
- 	/* use the encryption/decryption context variables below */
-+	ctx = EVP_CIPHER_CTX_new();
-+	if (!ctx) {
-+	    fprintf(stderr, "Failed to create encryption/decryption context.\n");
-+	    goto finished;
-+	}
- 	if (encrypt) {
--		ctx = &E_ctx;
- 		keystr = E_keystr;
- 	} else {
--		ctx = &D_ctx;
- 		keystr = D_keystr;
- 	}
- 
-@@ -797,7 +804,6 @@ static void enc_xfer(int sock_fr, int so
- 		if (whoops) {
- 			fprintf(stderr, "%s: %s - WARNING: MSRC4 mode and IGNORING random salt\n", prog, encstr);
- 			fprintf(stderr, "%s: %s - WARNING: and initialization vector!!\n", prog, encstr);
--			EVP_CIPHER_CTX_init(ctx);
- 			if (pw_in) {
- 			    /* for pw=xxxx a md5 hash is used */
- 			    EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
-@@ -816,7 +822,6 @@ static void enc_xfer(int sock_fr, int so
- 
- 			EVP_BytesToKey(Cipher, Digest, NULL, (unsigned char *) keydata,
- 			    keydata_len, 1, keystr, ivec); 
--			EVP_CIPHER_CTX_init(ctx);
- 			EVP_CipherInit_ex(ctx, Cipher, NULL, keystr, ivec,
- 			    encrypt);
- 		}
-@@ -836,9 +841,9 @@ static void enc_xfer(int sock_fr, int so
- 			in_salt = salt;
- 		}
- 
--		if (ivec_size < Cipher->iv_len && !securevnc) {
-+		if (ivec_size < EVP_CIPHER_iv_length(Cipher) && !securevnc) {
- 			fprintf(stderr, "%s: %s - WARNING: short IV %d < %d\n",
--			    prog, encstr, ivec_size, Cipher->iv_len);
-+			    prog, encstr, ivec_size, EVP_CIPHER_iv_length(Cipher));
- 		}
- 
- 		/* make the hashed value and place in keystr */
-@@ -877,9 +882,6 @@ static void enc_xfer(int sock_fr, int so
- 		}
- 
- 
--		/* initialize the context */
--		EVP_CIPHER_CTX_init(ctx);
--
- 
- 		/* set the cipher & initialize */
- 
-@@ -986,6 +988,7 @@ static void enc_xfer(int sock_fr, int so
- 	/* transfer done (viewer exited or some error) */
- 	finished:
- 
-+	if (ctx) EVP_CIPHER_CTX_free(ctx);
- 	fprintf(stderr, "\n%s: %s - close sock_to\n", prog, encstr);
- 	close(sock_to);
- 
-@@ -1060,14 +1063,14 @@ static int securevnc_server_rsa_save_dia
- }
- 
- static char *rsa_md5_sum(unsigned char* rsabuf) {
--	EVP_MD_CTX md;
-+	EVP_MD_CTX *md = EVP_MD_CTX_create();
- 	char digest[EVP_MAX_MD_SIZE], tmp[16];
- 	char md5str[EVP_MAX_MD_SIZE * 8];
- 	unsigned int i, size = 0;
- 
--	EVP_DigestInit(&md, EVP_md5());
--	EVP_DigestUpdate(&md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE);
--	EVP_DigestFinal(&md, (unsigned char *)digest, &size);
-+	EVP_DigestInit(md, EVP_md5());
-+	EVP_DigestUpdate(md, rsabuf, SECUREVNC_RSA_PUBKEY_SIZE);
-+	EVP_DigestFinal(md, (unsigned char *)digest, &size);
- 
- 	memset(md5str, 0, sizeof(md5str));
- 	for (i=0; i < size; i++) {
-@@ -1075,6 +1078,7 @@ static char *rsa_md5_sum(unsigned char*
- 		sprintf(tmp, "%02x", (int) uc);
- 		strcat(md5str, tmp);
- 	}
-+	EVP_MD_CTX_destroy(md);
- 	return strdup(md5str);
- }
- 
-@@ -1184,7 +1188,7 @@ static void sslexit(char *msg) {
- 
- static void securevnc_setup(int conn1, int conn2) {
- 	RSA *rsa = NULL;
--	EVP_CIPHER_CTX init_ctx;
-+	EVP_CIPHER_CTX *init_ctx = EVP_CIPHER_CTX_new();
- 	unsigned char keystr[EVP_MAX_KEY_LENGTH];
- 	unsigned char *rsabuf, *rsasav;
- 	unsigned char *encrypted_keybuf;
-@@ -1203,6 +1207,8 @@ static void securevnc_setup(int conn1, i
- 
- 	ERR_load_crypto_strings();
- 
-+	if (!init_ctx) sslexit("securevnc_setup: EVP_CIPHER_CTX_new() failed");
-+	
- 	/* alloc and read from server the 270 comprising the rsa public key: */
- 	rsabuf = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1);
- 	rsasav = (unsigned char *) calloc(SECUREVNC_RSA_PUBKEY_SIZE, 1);
-@@ -1323,8 +1329,7 @@ static void securevnc_setup(int conn1, i
- 	/*
- 	 * Back to the work involving the tmp obscuring key:
- 	 */
--	EVP_CIPHER_CTX_init(&init_ctx);
--	rc = EVP_CipherInit_ex(&init_ctx, EVP_rc4(), NULL, initkey, NULL, 1);
-+	rc = EVP_CipherInit_ex(init_ctx, EVP_rc4(), NULL, initkey, NULL, 1);
- 	if (rc == 0) {
- 		sslexit("securevnc_setup: EVP_CipherInit_ex(init_ctx) failed");
- 	}
-@@ -1340,13 +1345,13 @@ static void securevnc_setup(int conn1, i
- 	/* decode with the tmp key */
- 	if (n > 0) {
- 		memset(to_viewer, 0, sizeof(to_viewer));
--		if (EVP_CipherUpdate(&init_ctx, to_viewer, &len, buf, n) == 0) {
-+		if (EVP_CipherUpdate(init_ctx, to_viewer, &len, buf, n) == 0) {
- 			sslexit("securevnc_setup: EVP_CipherUpdate(init_ctx) failed");
- 			exit(1);
- 		}
- 		to_viewer_len = len;
- 	}
--	EVP_CIPHER_CTX_cleanup(&init_ctx);
-+	EVP_CIPHER_CTX_free(init_ctx);
- 	free(initkey);
- 
- 	/* print what we would send to the viewer (sent below): */
-@@ -1407,7 +1412,7 @@ static void securevnc_setup(int conn1, i
- 
- 	if (client_auth_req && client_auth) {
- 		RSA *client_rsa = load_client_auth(client_auth);
--		EVP_MD_CTX dctx;
-+		EVP_MD_CTX *dctx = EVP_MD_CTX_create();
- 		unsigned char digest[EVP_MAX_MD_SIZE], *signature;
- 		unsigned int ndig = 0, nsig = 0;
- 
-@@ -1421,8 +1426,8 @@ static void securevnc_setup(int conn1, i
- 			exit(1);
- 		}
- 
--		EVP_DigestInit(&dctx, EVP_sha1());
--		EVP_DigestUpdate(&dctx, keystr, SECUREVNC_KEY_SIZE);
-+		EVP_DigestInit(dctx, EVP_sha1());
-+		EVP_DigestUpdate(dctx, keystr, SECUREVNC_KEY_SIZE);
- 		/*
- 		 * Without something like the following MITM is still possible.
- 		 * This is because the MITM knows keystr and can use it with
-@@ -1433,7 +1438,7 @@ static void securevnc_setup(int conn1, i
- 		 * he doesn't have Viewer_ClientAuth.pkey.
- 		 */
- 		if (0) {
--			EVP_DigestUpdate(&dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE);
-+			EVP_DigestUpdate(dctx, rsasav, SECUREVNC_RSA_PUBKEY_SIZE);
- 			if (!keystore_verified) {
- 				fprintf(stderr, "securevnc_setup:\n");
- 				fprintf(stderr, "securevnc_setup: Warning: even *WITH* Client Authentication in SecureVNC,\n");
-@@ -1456,7 +1461,8 @@ static void securevnc_setup(int conn1, i
- 				fprintf(stderr, "securevnc_setup:\n");
- 			}
- 		}
--		EVP_DigestFinal(&dctx, (unsigned char *)digest, &ndig);
-+		EVP_DigestFinal(dctx, (unsigned char *)digest, &ndig);
-+		EVP_MD_CTX_destroy(dctx);
- 
- 		signature = (unsigned char *) calloc(RSA_size(client_rsa), 1);
- 		RSA_sign(NID_sha1, digest, ndig, signature, &nsig, client_rsa);
diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml
deleted file mode 100644
index 10e612cde180..000000000000
--- a/net-misc/ssvnc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">ssvnc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild b/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
deleted file mode 100644
index fbd99ff15127..000000000000
--- a/net-misc/ssvnc/ssvnc-1.0.29-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="VNC viewer that adds encryption security to VNC connections"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/ssvnc.html"
-SRC_URI="mirror://sourceforge/ssvnc/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="java"
-
-RDEPEND="
-	sys-libs/zlib:0=
-	virtual/jpeg:0
-	dev-libs/openssl:0=
-	dev-lang/tk:0=
-	net-misc/stunnel
-	java? ( virtual/jre:* )
-	x11-terms/xterm
-	x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-"
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.29-build.patch
-	"${FILESDIR}"/${PN}-1.0.29-openssl1.1.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^LIB/s:lib/:$(get_libdir)/:" \
-		-e "$(use java || echo '/^JSRC/s:=.*:=:')" \
-		Makefile || die
-	sed -i \
-		-e '/^CC/s:=.*:+= $(CFLAGS) $(CPPFLAGS) $(LDFLAGS):' \
-		vncstorepw/Makefile || die
-
-	cp "${FILESDIR}"/Makefile.libvncauth vnc_unixsrc/libvncauth/Makefile || die
-	cd "${S}"/vnc_unixsrc/vncviewer || die
-	sed -n '/^SRCS/,/^$/p' Imakefile > Makefile.in || die
-	cp "${FILESDIR}"/Makefile.vncviewer Makefile || die
-}
-
-src_compile() {
-	tc-export AR CC CXX RANLIB
-	emake all
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	einstalldocs
-}
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
deleted file mode 100644
index c781b7358097..000000000000
--- a/net-misc/trackma/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
-DIST trackma-0.8.2.tar.gz 171917 BLAKE2B 9fedd04036d55ef8fa748e64a18a2d471cab61b71030840baf18252cb81d2ad3df72eba6d417484c2772cb81d3e0e6e2311440c77040a899152681e427408a7a SHA512 6063f65fa70ee65f3b30cd2750bc1f501a6a94dc796195f11d89f4430cdae830fc5987bf6d261c77603c9cc5d32f80286aeecc05d44f766ca705e932997d46f1
-EBUILD trackma-0.7.4-r1.ebuild 1946 BLAKE2B 747c2e436a4488088d0b54a7c02d235eb29e4b906ceb9fdb3add5b44a8ecad2f875005e06d8b94791190b5caf9b647b834bd92a0833b2d41ffd201978c2a468a SHA512 792d5f2ede9f85ead17025ace37e7812fb996d02c72708486e3032ee7237333dbeeb005457ca6709bd87ad2f34a4c519a178762808945e34ba793ec4e78eeebb
-EBUILD trackma-0.8.2.ebuild 1945 BLAKE2B 2a269c6b0446b30a7a99db1048ded5554cc5f1745df8cd6c4e71d126b3fc3bc555a301d2612e95213e96f2cda40707e10e4017c8ee35f1385c6a07a39ae94124 SHA512 6eb5d08f5dea23506767d0dcb1440ee9deff15d19e88819b77b0a2c695058d22644df832d124445d431548cff9c96c0cadbe98e970522db884a83afe98e953da
-EBUILD trackma-9999.ebuild 1898 BLAKE2B 52dc023f0eb31a1354e7eab976ea223c5ed8288e7597e384a40a84d06df32cb98f0451dd16a62cdd4c95ba55a707b22a0cee23b531ed0da3484c27c3cb2bb0a0 SHA512 b8a17e6ba208a17042780333d7c56922862f61022afc46b2d4d0c81957c8d171d621c7d39760018d23620a740ef78f1c45b151ce6ec484a2014955cdeb2b2952
-MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/metadata.xml b/net-misc/trackma/metadata.xml
deleted file mode 100644
index 4412ee5ffa5d..000000000000
--- a/net-misc/trackma/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<longdescription>
-	Trackma aims to be a lightweight and simple but feature-rich program for Unix based systems for fetching, updating and using data from personal lists hosted in several media tracking websites.
-</longdescription>
-<use>
-	<flag name="cli">Enable cli version</flag>
-	<flag name="ncurses">Enable curses version</flag>
-</use>
-<!-- maintainer-needed -->
-<upstream>
-	<remote-id type="github">z411/trackma</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/net-misc/trackma/trackma-0.7.4-r1.ebuild b/net-misc/trackma/trackma-0.7.4-r1.ebuild
deleted file mode 100644
index 3cf1a43582fb..000000000000
--- a/net-misc/trackma/trackma-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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/qt4ui.py" || die
-	if ! use qt5; then
-		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/qtui.py" || die
-	fi
-	if ! use gtk; then
-		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/gtkui.py" || 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-0.8.2.ebuild b/net-misc/trackma/trackma-0.8.2.ebuild
deleted file mode 100644
index e632d4103918..000000000000
--- a/net-misc/trackma/trackma-0.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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
deleted file mode 100644
index 6d746c2385f4..000000000000
--- a/net-misc/trackma/trackma-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils git-r3
-
-DESCRIPTION="Open multi-site list manager for media tracking sites"
-HOMEPAGE="https://github.com/z411/trackma"
-EGIT_REPO_URI="https://github.com/z411/${PN}"
-LICENSE="GPL-3"
-SLOT="0"
-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}]
-		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/qt4ui.py" || die
-	if ! use qt5; then
-		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/qtui.py" || die
-	fi
-	if ! use gtk; then
-		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
-		rm "${S}/trackma/ui/gtkui.py" || 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/you-get/Manifest b/net-misc/you-get/Manifest
index 7ce663b51be6..051bd0519258 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,7 +1,5 @@
-DIST you-get-0.4.1270.tar.gz 143127 BLAKE2B 2c18a97001caf0c44a5baf30042cde61ac0ad2e8a5d0c0dc178474ba9cb70671c4bc9ecbbb72515f4fec2306598ba1b42d66192f2a16aa8fd0d65ff47eeb0b61 SHA512 fc21563396d73b0fbd7ff02c423a256be548957ef5d72277c887d33ee05269c2aa404a66972e934d4f0076ebd30bfa1b0914b05c25b38b63b3701dad1361587b
 DIST you-get-0.4.1355.tar.gz 143921 BLAKE2B da303fbcedd0818d785f846da4022364c3782d74b50f01b8aa2c0da38f4d61108da22a991e3ae02660021df6ee3378fb9e03826210563aee37e7f85e72b52fa1 SHA512 20f092d49e554f994b57dec4f12a8a0f4aaf418f8e0ce68611e1424f5ee512cad104c5498fe7d133ae8fa1c65440fdbebb8d523d9792336ea5c62ac3a58aa9ba
-DIST you-get-0.4.536.tar.gz 104745 BLAKE2B 48a5432ae1d4448ce0dcbbfdf52225920eb8cd8e575030cc62da0637f10cc7bb02a983c27c5bdd4a9fac1b45ab129db4f7fcc2ebb4bd17189918e04dabae0cfd SHA512 13d280dd5f0e6b6b5033de6eb94a251007bfc21bd99a9c0af86a5ed7b1c9b267d742c278dd80ec0a13445e09f2e22aea23bc77a5da12557be33f97731258abc6
-EBUILD you-get-0.4.1270-r1.ebuild 485 BLAKE2B b0e8bdc4e0b9a2cd814b19876e87102e7fd17ae5ebaaa21c664799cb266cfaf31082dbb3e27b2cb5bd362a18f5e044d024af8497c628db086b6e4a38ff9e9038 SHA512 4930e84a414a836de7fdb7e03b3f7d5cd0ac2cafe7b80b015fbd678101456de4c03e2ee21855d2c5b1fd501125a0b0709c7487254697c48e57cf45a8eeebec4a
+DIST you-get-0.4.1432.tar.gz 149854 BLAKE2B 227fc950dfdfdbcf899a06db37e0b4e9060e7f82bfbae8a8081a6930827d32f59cc0ec32c0c2166f46d55b958930cafdb4bd1e81d46b7326ca759c58e4e68cd3 SHA512 aef856c86f574470ffbe0ebcb056b63f08663c514a68fc3953a2c10497df44d5f76fa19c593c1c02559effd13f32c82bd52738d033b6cd0bd7b1e8f8c418b680
 EBUILD you-get-0.4.1355-r1.ebuild 489 BLAKE2B 553a8ad218524c336b2ba4d0b1c814b2325a8d9d6dcb8a05e3842cd08938056b54555a80167ff3b331c153772d91878757d6a31d49346455a3e69a73a135bf72 SHA512 5be3e46d8fe95a94ff6d5a0517ac2a0eb0703e03c8d1dc06a19b887e77c53a613fa99ebd1b1195dc4ec2e8077495107b2b474704eae4923bc078e74ee9e59aab
-EBUILD you-get-0.4.536-r1.ebuild 483 BLAKE2B 36ca93c77820ac029f79eb1401620c66b07e28a963d83aeb11be4b1e378b9bb9ba1af728b40537294d07298ec6614c9ae598630b80f35fc7d51182d0db66505d SHA512 2790cac8a0bc8fc5fbdae4d21dc7c493762ee2559992b5008d3a72aca1271d3f222eb186faba16ebc21c86ee1c8e93d54e15ba98d377bb10d1389624e2f2bbde
+EBUILD you-get-0.4.1432.ebuild 528 BLAKE2B a938f81662e2d2093ecc29d38cb59e9265c258e4f35228e2aaa66c1886258e721cec407157eefaffdd4b4d247e10e7a20818db601eb9aa17b3c438c4ac889214 SHA512 470e3037e1c204915d4ef8c2f1b541180c390cd56118fe04db7f75feb76ee62773ea5403690a9a455fff2a6a0be63741de632957a5b1c3cb57c5e7065f1b463b
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1270-r1.ebuild b/net-misc/you-get/you-get-0.4.1432.ebuild
index c8fd8bc47327..95797d08f17c 100644
--- a/net-misc/you-get/you-get-0.4.1270-r1.ebuild
+++ b/net-misc/you-get/you-get-0.4.1432.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit eutils distutils-r1
 
diff --git a/net-misc/you-get/you-get-0.4.536-r1.ebuild b/net-misc/you-get/you-get-0.4.536-r1.ebuild
deleted file mode 100644
index 6a6f50f9d60b..000000000000
--- a/net-misc/you-get/you-get-0.4.536-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python3_6)
-
-inherit eutils distutils-r1
-
-DESCRIPTION="utility to download media contents from the web"
-HOMEPAGE="http://www.soimort.org/you-get"
-SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	media-video/ffmpeg
-"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 2a1adb585438..5e7584339d2f 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2020.05.08.tar.gz 3172744 BLAKE2B d3ae7cc18f4156f4fe6fc17b4ef46f8406cd0b01ae18e3317d048bdbc737a9b12c67c9aded22a8e7631ea3b0f90f6b306f4148a5e33a0a597490b35fcf3b5113 SHA512 fbfd6bc42959547c6307b291478d7d86b79847a92d193b795d91f717471927d22c45356c0e2ba03ea1c5bc96d2fa5a949cb2283b0d7ec976bcf3a54d6c928ed1
+DIST youtube-dl-2020.05.29.tar.gz 3174451 BLAKE2B 5ec37038a49c24e27fe6dc1b6286d41a320f694ac9fb21be0444e476029e3f3f0a286f1c5a103b8e6fe97dd8301d6a8d2a5a31088769145fed6de318a15bf609 SHA512 d96a93e1b1dbd27236c827d1d03e8482b6adbd1c85c9c5befe1a8bb998cc6ea81451c0830a57de0f8f03f4da3b57d57b81fbbd4547c1f73c9789d51f9d18f7c3
 EBUILD youtube-dl-2020.05.08.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
+EBUILD youtube-dl-2020.05.29.ebuild 2171 BLAKE2B a119ca9346ab4b312f68184a5982c0db646ab961ba3282c94104db31eac370e70c8b3dda2b24bb0729c4760e267ffb740c08d5203c78a4585b5c60ad7944a26c SHA512 8415d6657358075646e8ccb5963bb616dd4f953942c8eff9214185a4d126c3c40522302ac7ce22c18f5bc45735a7d47cb7bbcd74f314eb230fa0888ae8a07753
 EBUILD youtube-dl-99999999.ebuild 2068 BLAKE2B 93977d0be35ac43d7ba1cea51a20364effe0c87a11684e02a13b70fd682d8199fff2652bd86767b3ea4a148603ee93ecd7837e7fcc54139de5ae59cdc510c1e6 SHA512 429c926a0fce1cc0ab8cabdae8904ab0fcd99399c7b6e924d7034ad07f6d038489f44ebb9ac0d69cc270a023c37d0a2845fa22deb8bd94a4d6d9237dd1114043
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.05.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.05.29.ebuild
new file mode 100644
index 000000000000..27edc068096a
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.05.29.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{6,7,8})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+	elog "On some sites - most notably YouTube - videos can be retrieved in"
+	elog "a higher quality format without sound. ${PN} will detect whether"
+	elog "ffmpeg is present and automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /net-misc
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)