gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-misc
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
104 files changed, 1745 insertions, 1421 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index dace7512d9ba..4dde49ee53f8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 513f443c1c3f..0b7deeb89375 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -13,4 +13,4 @@ EBUILD anydesk-5.5.0-r1.ebuild 2588 BLAKE2B aa17a6f0655dc06d9183d8b4699fa58e6147
 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
+MISC metadata.xml 886 BLAKE2B 9cad890e470555034e22adec55e4aa5dd047289e054e708cbe9f6338f97440913fa63618a5a362a90749c17bb0f78b712af090c013da001b2e547733f6faac89 SHA512 897b088c714bf32fa0810c94c97131b5ebb00bffba3bf1b0e846064c83f0b65c3a0d52048a74ee27ae4ad1a12f1ea758a69f49185ddfba9a5b8c285be8f32ea3
diff --git a/net-misc/anydesk/metadata.xml b/net-misc/anydesk/metadata.xml
index 09ba7bee8006..d9c4330ac25f 100644
--- a/net-misc/anydesk/metadata.xml
+++ b/net-misc/anydesk/metadata.xml
@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>cb-gentoo@guya.de</email>
-		<name>Christian Buchinger</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<changelog>https://download.anydesk.com/changelog.txt</changelog>
-		<bugs-to>mailto:support@anydesk.com</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		Connect to a computer remotely, be it from the other end of the office
-		or halfway around the world. AnyDesk ensures secure and reliable remote
-		desktop connections for IT professionals and on-the-go individuals alike.
-	</longdescription>
+<maintainer type="person">
+	<email>jmbsvicetto@gentoo.org</email>
+	<name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
+<maintainer type="person">
+	<email>cb-gentoo@guya.de</email>
+	<name>Christian Buchinger</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<upstream>
+	<changelog>https://download.anydesk.com/changelog.txt</changelog>
+	<bugs-to>mailto:support@anydesk.com</bugs-to>
+</upstream>
+<longdescription lang="en">
+	Connect to a computer remotely, be it from the other end of the office
+	or halfway around the world. AnyDesk ensures secure and reliable remote
+	desktop connections for IT professionals and on-the-go individuals alike.
+</longdescription>
 </pkgmetadata>
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 83751c3f3abe..12532183898b 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD axel-2.17.8.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936
+EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9
 MISC metadata.xml 410 BLAKE2B 89c374385d4e3a03953352d1d995029ca481386a0c522b1c4c2c18bc58c62f65e5eb287a656392093d72735174adc8e48dacd1771989d0bdd6ca2a0c77e3cd80 SHA512 f64c314f27882031b215373ded6b4a1e0a93b398ec96aff1a429ef6b01cc1d426c1692b8f2ecdea4f5503d853d753f292a7edac960a559bcb60ea491d5a1e7ce
diff --git a/net-misc/axel/axel-2.17.7.ebuild b/net-misc/axel/axel-2.17.7.ebuild
deleted file mode 100644
index 72e5d4d16651..000000000000
--- a/net-misc/axel/axel-2.17.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
-IUSE="debug libressl nls ssl"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with portage, create a script in'
-	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
-	einfo
-	einfo ' #!/bin/bash'
-	einfo ' set -e'
-	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
-	einfo ' mv "$1.axel" "$1"'
-	einfo
-	einfo 'and then add the following to your make.conf:'
-	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
-	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
-}
diff --git a/net-misc/axel/axel-2.17.8.ebuild b/net-misc/axel/axel-2.17.8.ebuild
index dad9472d9679..6c2695bbd2a4 100644
--- a/net-misc/axel/axel-2.17.8.ebuild
+++ b/net-misc/axel/axel-2.17.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
diff --git a/net-misc/bsdwhois/Manifest b/net-misc/bsdwhois/Manifest
index ad693534ac41..4ea7c3b599ab 100644
--- a/net-misc/bsdwhois/Manifest
+++ b/net-misc/bsdwhois/Manifest
@@ -1,3 +1,3 @@
 DIST bsdwhois-1.43.2.1.tar.gz 85895 BLAKE2B 584bec2f58deee1208b35df1dae0b638049eab990cade979f56022b701d24b2cd653feb381f79e89610246743c8b20df2c7b83cffec68e3a00a9169c79edd7e5 SHA512 c1b3f93b8d7f838478d59cb70a7326fba84f87e1fcb4af9e7cc64ac1928adf96b0e6facbd6dfabaa7d146f0d1ea1abe1330771be4c7a6f3590d3c9e86a3b53dc
-EBUILD bsdwhois-1.43.2.1.ebuild 490 BLAKE2B 05c4a8f6f6f44436c9759726df72246f04ea94c5a923ed8f9aa806832b291b25ac8580ea66d20b8b982de2d152a50ca56cb60b2dc79c5eb1ffc50482a881300f SHA512 e0983964beb98b29e955a2799869f66b16a0dc38856c04e23ed747ccfaf5eac8651f22bfa017ed6072a226d4184b502e04e86fc4fc2454e450213bc0a66b755c
+EBUILD bsdwhois-1.43.2.1.ebuild 488 BLAKE2B 4152da86fadeb994c8f4b57333327dc8d9c203d85b62802a99c4598ca9c809a3b2d8ba0eaf17b242341cb565859e9b82415db78574d5571afaa952051cabbe6e SHA512 2c4eac4b32f961d4a31f2955a561b85f457a8b73d763cb5438b11b904d30affb5fdb0983e049aa50e17e2be361cb3781043b7b74842e90bb243b8421bc527240
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
index 20bd75b5bf0c..d528d6c40956 100644
--- a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
+++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 DESCRIPTION="FreeBSD Whois Client"
-HOMEPAGE="http://www.freebsd.org/"
+HOMEPAGE="https://www.freebsd.org/"
 SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index c3237b9fa439..105dae3b30b1 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,9 +1,3 @@
-DIST cmst-2019.01.13.tar.gz 2576200 BLAKE2B 4b1c75c479651887a14d5b4266a99a36667c1d02f114c4a9886b5aaec445e320fc684d42793312d68e4eb3386ea8516aef3cecb705e37f8b9a88ea8bf5bcf512 SHA512 ba7cf94263b4908dc2a609216f82bd758ad727f623d65b2e876a02c1fd956b7090a8222e953a0cd2da9527eddaab918e9c735381c705b9943e9e8aaeeb00d835
-DIST cmst-2020.03.07.tar.gz 2722455 BLAKE2B d7119c6194596bc957793a9054f306ecedf84f8b57a8e7dcbbff0d49231c512cddbe530aa7f49428e8fe60abe3fb48616288a61d865845775958564da6d77a55 SHA512 43fd5fab8a2e4914557efd57dfa92d3dd7ec67f322b1eb1c25cfe90fa860254d1bcad9e31cddeddd3c1c5f8e1cca4cd33457a796607a6b008340d191c62ac5b2
-DIST cmst-2020.04.12.tar.gz 2726340 BLAKE2B 07d07c0d7cbe0f06f78a2fcea5381f026adf7aa6a603026aad53b0f35d96eb5c498267d9a32387163735188fa2814b894001562bbdc487116383c7a40e8a05d5 SHA512 f27087f06b8a74b54ac38f6874726ca2eb3bf8106eb4e3feb6c88909e980628dbb8a88a9c1da09efa48ceca9126b9edc7807558b6c9e8b9f7ab85c3f5b149a47
 DIST cmst-2020.05.09.tar.gz 2727228 BLAKE2B f24f05e14de589381dbfc7c0087d08eed23ed0ee4df23be7fd2bf25d8c36519771aca39e74942ec01fe6327b5ab52c74336b85f9b61da3d8a9b83c2a8312721e SHA512 9debc16d34fa8fed37f514c70282b7ccdece8da3612332a886a2b1b5c6f6ff86c046c5da6272c00836f0acc3cd6dd82321d3cb2f81784ea1512719b70eba1b6c
-EBUILD cmst-2019.01.13.ebuild 818 BLAKE2B 7fa6c5129b6a35dbe54d069ed904f99da29973cfeec447cbbfef7608f215dc6d93039601fb9887a761a32fc65c7077eeea9a91a5c2177408a3feab07d4c349af SHA512 e62a40db50996bf991f274930d9020039897c670a737953cef1785dbb0d25a8bfa6f1be74e0a5555ff7d705776499bbe4952a97b5641715958d0a1297d6eff1b
-EBUILD cmst-2020.03.07.ebuild 800 BLAKE2B 7fe1807c6b0ebfc5a29baa3c9942b88a81d85a0edcffa90358fb1425fa64402bea20a922fc64a5a9ca1901199d96bf8614ad624e78f51db4343b7b809fcb9b2a SHA512 f614ca72fdd68535095c74d01d00bff5054fab2a2e9d0eb6c8e14a3019268de37dac6257c833b4a348262ef6106280d957bc7df8bc407ea5abde6613e03c833c
-EBUILD cmst-2020.04.12.ebuild 800 BLAKE2B 7fe1807c6b0ebfc5a29baa3c9942b88a81d85a0edcffa90358fb1425fa64402bea20a922fc64a5a9ca1901199d96bf8614ad624e78f51db4343b7b809fcb9b2a SHA512 f614ca72fdd68535095c74d01d00bff5054fab2a2e9d0eb6c8e14a3019268de37dac6257c833b4a348262ef6106280d957bc7df8bc407ea5abde6613e03c833c
-EBUILD cmst-2020.05.09.ebuild 844 BLAKE2B 97bd9dd4423cbf8293e143b962e3365e96da3f4bd70ad1de04319e245ab898c3d1fe42ebf1d250109045b03b8ba5a3928019807afed1515fa22c38c2edb748a1 SHA512 052ad0cf61f8f8ed17bcedbc595310b72474dc20af061a1e2c8c420e61ebc6ff4f38cc8ad3a1a2d2011daa4868520f4905b22f34b7681d9e94d8fa93609a62b5
+EBUILD cmst-2020.05.09.ebuild 842 BLAKE2B 025957f9befade5083cea90cddfe9c8c751b1291afd3db59e76017ed731727083a3bac9295809d87594483797b8d55afd67496b4cd9c3c3ce5b72ece2f5b8b09 SHA512 520b528cffafbe7fa1133f10a57621777adf906df142e6bf7ade46ea932dd7c1ece14807f47148a5262a613f2e73a3f9f53ff455916f059749011b71c24937a6
 MISC metadata.xml 389 BLAKE2B fa4bcb790a8e29dcfb5d87f3b675824dbd909a148253470189db24b6bd9b4282d1ddbd1dbedaec31f4d0dbe07cfdff0cc7331d6863842f5db7e597e7614698ee SHA512 b589825d436c4ad3b0781acc5b64cf044f056a70ca72f52cb0341b05e87bf8b269049dcef4e7a6acb8bd76c3a909eaa7c8a0bd77794e7266eb8e7cb7f6fbf7ad
diff --git a/net-misc/cmst/cmst-2019.01.13.ebuild b/net-misc/cmst/cmst-2019.01.13.ebuild
deleted file mode 100644
index 99a11c5222e4..000000000000
--- a/net-misc/cmst/cmst-2019.01.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="https://github.com/andrew-bibb/cmst/archive/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/connman
-"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5 DISTRO=gentoo
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${D}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/cmst/cmst-2020.03.07.ebuild b/net-misc/cmst/cmst-2020.03.07.ebuild
deleted file mode 100644
index 7e44b788f094..000000000000
--- a/net-misc/cmst/cmst-2020.03.07.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="https://github.com/andrew-bibb/cmst/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/connman
-"
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5 DISTRO=gentoo
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${D}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/cmst/cmst-2020.04.12.ebuild b/net-misc/cmst/cmst-2020.04.12.ebuild
deleted file mode 100644
index 7e44b788f094..000000000000
--- a/net-misc/cmst/cmst-2020.04.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="Qt GUI for Connman with system tray icon"
-HOMEPAGE="https://github.com/andrew-bibb/cmst"
-SRC_URI="https://github.com/andrew-bibb/cmst/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	net-misc/connman
-"
-
-src_configure() {
-	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	eqmake5 DISTRO=gentoo
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	rm -r "${D}"/usr/share/licenses || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/cmst/cmst-2020.05.09.ebuild b/net-misc/cmst/cmst-2020.05.09.ebuild
index 02c5f056724b..6464f6f80bf5 100644
--- a/net-misc/cmst/cmst-2020.05.09.ebuild
+++ b/net-misc/cmst/cmst-2020.05.09.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andrew-bibb/cmst/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ea6c22b593ea..8e11a8351a2e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,4 +1,5 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
+AUX curl-fix-cpu-load.patch 3369 BLAKE2B 049a0d5b0dc6262d2d722e037d75cd966f7b87fd7e4bea23130118e91f1b54e1d374e2879b235cc90aeae8357588167b6bec7a375f9b23a4f96944ff12841519 SHA512 223a8b68157d58b050f89b46d2f3f5a486aa111fe5f5df46db3b49745e2a17e6be4a19fbf9b398f62311ee34fb0051f5302025632152188e840a0c60256b4da0
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
@@ -6,5 +7,5 @@ DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2
 DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
 EBUILD curl-7.68.0.ebuild 7600 BLAKE2B cc01e76a04b7023aa8aca65e65338279137fcf943ce474518fb807e9b4eaeecfb18022c39e8157a964168f73f07ab32c1e2553ad829ed5335f4f347506c45e45 SHA512 77bac8d7fd71c7f760ded2c96085e48c0f78b782cbde0b0449164e64c10ef527b2540ee7b8dc2dd3666560dd074fcf6b05d8d289798db3e12be2cf5b3a15f3a7
 EBUILD curl-7.69.1.ebuild 7689 BLAKE2B 6ebb15523c0c917566909676365e777b084deca51fc7b70c994c1b220ee14636db15b94f13b59c5a87e2d0db3e63c5cba70b86062fe67cf3969e8df8eaf857bb SHA512 634fbd2b51bec9d18b71233cbd13c1483713063442d73442749b7bc9ebee914b9abb0810d2291e9e14c969da3bcc575f9d00699ddc27b073b9a6ad37aba7813e
-EBUILD curl-7.70.0.ebuild 7714 BLAKE2B 360a1cc39ce2b4d49c209194d315150fe89c44393c381388e2a2dc97b02e7e59e61a85b7e39e86e316c0f5be0b25e1d5553601c81b5cb5dc64a91738da332372 SHA512 06460ecff9c0b62136d2e3dd1cade6cd2132f4f0ae23942f01e48a5c345057247bb1879bc505678c9d242f5f7a36e7dea9bbdfc9f457d55243d352417f4eb508
+EBUILD curl-7.70.0-r1.ebuild 7761 BLAKE2B 00d1cb77817f4410c555d5892e3f32da58735ec42efa33ef1c2bf60fddb6a2c9f4e716f89bcc53f53f29ea6f549854f890cb5a7f7cc8bd6c95efd3230ec4f7e0 SHA512 42933f751419d2bad72e06aadea7948824cf2d2139647316d63077199d96ee98192182cda097a4f855319fc2f93523548745870c18faf4b59a925b7678fb0c7a
 MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9
diff --git a/net-misc/curl/curl-7.70.0.ebuild b/net-misc/curl/curl-7.70.0-r1.ebuild
index 6d8ee271731d..7b751a4ef1c8 100644
--- a/net-misc/curl/curl-7.70.0.ebuild
+++ b/net-misc/curl/curl-7.70.0-r1.ebuild
@@ -105,6 +105,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
 	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
 	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+	eapply "${FILESDIR}"/${PN}-fix-cpu-load.patch
 
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
diff --git a/net-misc/curl/files/curl-fix-cpu-load.patch b/net-misc/curl/files/curl-fix-cpu-load.patch
new file mode 100644
index 000000000000..fb20641b5b22
--- /dev/null
+++ b/net-misc/curl/files/curl-fix-cpu-load.patch
@@ -0,0 +1,94 @@
+Fixes https://bugs.gentoo.org/727352
+
+From 2a41e236716da4c41ebc1132bd36d9273bd0321f Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 8 Jun 2020 14:05:22 +0200
+Subject: [PATCH] socks: detect connection close during handshake
+
+The SOCKS4/5 state machines weren't properly terminated when the proxy
+connection got closed, leading to a busy-loop.
+
+Reported-By: zloi-user on github
+Fixes #5532
+Closes #5542
+---
+ lib/socks.c | 32 ++++++++++++++++++++++++++++----
+ 1 file changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/lib/socks.c b/lib/socks.c
+index 4c1af7b9de7..b2215fef30c 100644
+--- a/lib/socks.c
++++ b/lib/socks.c
+@@ -382,6 +382,11 @@ CURLcode Curl_SOCKS4(const char *proxy_user,
+             curl_easy_strerror(result));
+       return CURLE_COULDNT_CONNECT;
+     }
++    else if(!result && !actualread) {
++      /* connection closed */
++      failf(data, "connection to proxy closed");
++      return CURLE_COULDNT_CONNECT;
++    }
+     else if(actualread != sx->outstanding) {
+       /* remain in reading state */
+       sx->outstanding -= actualread;
+@@ -592,6 +597,11 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
+       failf(data, "Unable to receive initial SOCKS5 response.");
+       return CURLE_COULDNT_CONNECT;
+     }
++    else if(!result && !actualread) {
++      /* connection closed */
++      failf(data, "Connection to proxy closed");
++      return CURLE_COULDNT_CONNECT;
++    }
+     else if(actualread != sx->outstanding) {
+       /* remain in reading state */
+       sx->outstanding -= actualread;
+@@ -717,15 +727,19 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
+       failf(data, "Unable to receive SOCKS5 sub-negotiation response.");
+       return CURLE_COULDNT_CONNECT;
+     }
+-    if(actualread != sx->outstanding) {
++    else if(!result && !actualread) {
++      /* connection closed */
++      failf(data, "connection to proxy closed");
++      return CURLE_COULDNT_CONNECT;
++    }
++    else if(actualread != sx->outstanding) {
+       /* remain in state */
+       sx->outstanding -= actualread;
+       sx->outp += actualread;
+       return CURLE_OK;
+     }
+-
+     /* ignore the first (VER) byte */
+-    if(socksreq[1] != 0) { /* status */
++    else if(socksreq[1] != 0) { /* status */
+       failf(data, "User was rejected by the SOCKS5 server (%d %d).",
+             socksreq[0], socksreq[1]);
+       return CURLE_COULDNT_CONNECT;
+@@ -890,6 +904,11 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
+       failf(data, "Failed to receive SOCKS5 connect request ack.");
+       return CURLE_COULDNT_CONNECT;
+     }
++    else if(!result && !actualread) {
++      /* connection closed */
++      failf(data, "connection to proxy closed");
++      return CURLE_COULDNT_CONNECT;
++    }
+     else if(actualread != sx->outstanding) {
+       /* remain in state */
+       sx->outstanding -= actualread;
+@@ -967,7 +986,12 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
+       failf(data, "Failed to receive SOCKS5 connect request ack.");
+       return CURLE_COULDNT_CONNECT;
+     }
+-    if(actualread != sx->outstanding) {
++    else if(!result && !actualread) {
++      /* connection closed */
++      failf(data, "connection to proxy closed");
++      return CURLE_COULDNT_CONNECT;
++    }
++    else if(actualread != sx->outstanding) {
+       /* remain in state */
+       sx->outstanding -= actualread;
+       sx->outp += actualread;
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 79957361ebcb..abfb06109624 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,18 +1,13 @@
+AUX dhcpcd-9.1.1-embedded_config.patch 1158 BLAKE2B 4bd6cee24848296b526b0430bd8cd528d80f9bf4a2658bc6385ba1b1b8731f50416211c09f2f7317662e12cec50ecc82dc900eefed4fc637891dac71204ac786 SHA512 21c6ef0a27d252e224d23202a161c37a2851af9b47b9a0d7bd739111b4ee231080c0c9a1cd23cff1dd479d82fbe53d41a45941d0a9ddd6aa833f90856d9db595
 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
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
-DIST dhcpcd-9.0.1.tar.xz 244816 BLAKE2B 1cb346f7578dadb237d05056a8f6e39b30da831e253e6629c5c19e6a70f7b6d8ffcb6db37d0f720fda28577e8cb4227cbca8a08fac0c977098f66b2a430d9ffe SHA512 dea153c9a2f4a9d9c983bf50d8c18b544d7dbe1a2972ccc8eb33bbbc8b09178b39bdb9a38cc293db7861024509ccd475e11d84004bc4cd45947786f5e10db0a3
 DIST dhcpcd-9.0.2.tar.xz 244800 BLAKE2B d0c355141aa1e57715c30b2902eed7e2821f2c08fdc97497c9dc271689faf2ca22e3f50f17e6c7ae8fe4434d5c216572a42e1abf789287495e6db44f671d5085 SHA512 2a606bff2e96d1da5d3642ac68341c14b378d9a905cba364ab42eba1285604f8be56b9efeff3eee18d89b71f0f9f3b05cb7b88e8fce568baf1c0d1e5d3becb5f
-EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
-EBUILD dhcpcd-7.2.5.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
-EBUILD dhcpcd-8.1.7.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
+DIST dhcpcd-9.1.1.tar.xz 246084 BLAKE2B 35acaabb32e6a5b227071376e8a0387cadb776ee94a8b7f92c181440ef72bf60e9867e901347a139e4ce036c85913fa85e61d3c401c8a9f57e81dff76465ccab SHA512 7b1eb052293218e9b52f7ff40768eaa9db832979ffa8e4ba4724ce98bac9e9c809505b40aaebd4cf13192d0b30f2e963d34ca3b9c1e05458e86e11d06e1cbed8
 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-r1.ebuild 5336 BLAKE2B 57dec388e06fd7a3ac298cf8a89170921f361cd3373b0366e3db2e518d4691ebfcd1fa97fab108b06f5c807a994e0b410f20b4b4965f41e5dae2744cc55d978c SHA512 f1ee8587337dde8fb94d32cd65b34db15e797c16b58cfe0ec3cdb2c1336a706572669831150df09965ce0b226daa49b1bdfd92074b7469f80a915e4e8458e2a2
-EBUILD dhcpcd-9999.ebuild 5336 BLAKE2B 57dec388e06fd7a3ac298cf8a89170921f361cd3373b0366e3db2e518d4691ebfcd1fa97fab108b06f5c807a994e0b410f20b4b4965f41e5dae2744cc55d978c SHA512 f1ee8587337dde8fb94d32cd65b34db15e797c16b58cfe0ec3cdb2c1336a706572669831150df09965ce0b226daa49b1bdfd92074b7469f80a915e4e8458e2a2
+EBUILD dhcpcd-9.1.1-r1.ebuild 4668 BLAKE2B d51930d0db7ab398025e2d045f9d787953a51c6a1a0489c98ec42f2cb79505b7ab9d7caf233bb0216ed2f9d7115ff0dba8bea40a22af699b3ab52c7aba8c7621 SHA512 8ca49168fcf9557c9531f067fbd77b52db13b2cae315effccb9a8be96dc9ec546cff36b3d2ddbaedd6f377be3545cd54cfeb00a71d3ffd5916ea78ad7f7ede1c
+EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 MISC metadata.xml 661 BLAKE2B 079dd7ae7da62777750cda972982faec3a7040018c57a40b33874b20bbfcdf60a00487f38daaba2fcf10c2325c6d582d70983f5bb6fca64f309eaa81c615de93 SHA512 3b2db0737e02439895ee5d7fc06b9344c64282d4014ef1f7cc8ce19f93e8744aa929f85fba8f04c0a865f477a5066dfa083b568546665e870137c2989999e5e0
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
deleted file mode 100644
index 54861a24f9cc..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild
deleted file mode 100644
index 504876b53cf8..000000000000
--- a/net-misc/dhcpcd/dhcpcd-8.1.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild
deleted file mode 100644
index 9656eabee928..000000000000
--- a/net-misc/dhcpcd/dhcpcd-9.0.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="
-	${COMMON_DEPEND}
-	privsep? (
-		acct-group/dhcpcd
-		acct-user/dhcpcd
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable debug)
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(use_enable privsep)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
-		$(usex privsep '--privsepuser=dhcpcd' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# dhcpcd-9 introduced privesep support in a chroot
-	if use privsep ; then
-		local dhcpcd_libdir="/var/lib/dhcpcd"
-		local chroot_base="${EROOT}/var/chroot/dhcpcd"
-		local chroot_dir="${chroot_base}${dhcpcd_libdir}"
-		local chroot_retval=0
-		# Set up proper chroot.
-		if [[ ! -e "${chroot_dir}" ]] ; then
-			mkdir -p "${chroot_dir}" || chroot_retval=1
-			cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1
-			chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1
-		elif [[ ! -d "${chroot_dir}" ]] ; then
-			ewarn "${chroot_dir} is not a directory!"
-			ewarn "Did not set up ${PN} chroot!"
-		fi
-		if [[ "${chroot_retval}" -ne 0 ]] ; then
-			ewarn "There were issues setting up ${PN} chroot."
-		fi
-	fi
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild b/net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild
index 504876b53cf8..0942b0cd0435 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.1.1-r1.ebuild
@@ -7,7 +7,7 @@ inherit systemd toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+	EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
@@ -21,11 +21,21 @@ DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
 
 COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	privsep? (
+		acct-group/dhcpcd
+		acct-user/dhcpcd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-embedded_config.patch"
+)
 
 src_configure() {
 	local myeconfargs=(
@@ -34,10 +44,13 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var"
 		--prefix="${EPREFIX}"
 		--with-hook=ntp.conf
+		$(use_enable debug)
 		$(use_enable embedded)
 		$(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)"
 	)
@@ -47,8 +60,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 ac18c5907ad8..092c6e4a1dda 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
 
 COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
@@ -113,26 +113,6 @@ pkg_postinst() {
 		cp "${lease}" "${dbdir}/${new_lease}"
 	done
 
-	# dhcpcd-9 introduced privesep support in a chroot
-	if use privsep ; then
-		local dhcpcd_libdir="/var/lib/dhcpcd"
-		local chroot_base="${EROOT}/var/chroot/dhcpcd"
-		local chroot_dir="${chroot_base}${dhcpcd_libdir}"
-		local chroot_retval=0
-		# Set up proper chroot.
-		if [[ ! -e "${chroot_dir}" ]] ; then
-			mkdir -p "${chroot_dir}" || chroot_retval=1
-			cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1
-			chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1
-		elif [[ ! -d "${chroot_dir}" ]] ; then
-			ewarn "${chroot_dir} is not a directory!"
-			ewarn "Did not set up ${PN} chroot!"
-		fi
-		if [[ "${chroot_retval}" -ne 0 ]] ; then
-			ewarn "There were issues setting up ${PN} chroot."
-		fi
-	fi
-
 	# Warn about removing stale files
 	if [[ -n "${old_files[@]}" ]] ; then
 		elog
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch b/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch
new file mode 100644
index 000000000000..10e8520116f5
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.1.1-embedded_config.patch
@@ -0,0 +1,43 @@
+From fa1cd0004e0d3267a1217ada46e53df38824da2d Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Thu, 4 Jun 2020 21:49:37 +0100
+Subject: Fix installing the embedded config as a file.
+
+---
+ src/if-options.c   | 4 ++--
+ src/privsep-root.c | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/if-options.c b/src/if-options.c
+index 212e71d8..3dde04bf 100644
+--- a/src/if-options.c
++++ b/src/if-options.c
+@@ -2366,8 +2366,8 @@ read_config(struct dhcpcd_ctx *ctx,
+ 			return ifo;
+ 		}
+ 		if (buf[buflen - 1] != '\0') {
+-			if (buflen < sizeof(buf) - 1)
+-				bulen++;
++			if ((size_t)buflen < sizeof(buf) - 1)
++				buflen++;
+ 			buf[buflen - 1] = '\0';
+ 		}
+ #else
+diff --git a/src/privsep-root.c b/src/privsep-root.c
+index fdf43856..512dfcc0 100644
+--- a/src/privsep-root.c
++++ b/src/privsep-root.c
+@@ -297,6 +297,10 @@ ps_root_validpath(const struct dhcpcd_ctx *ctx, uint16_t cmd, const char *path)
+ 		return false;
+ 
+ 	if (cmd == PS_READFILE) {
++#ifdef EMBEDDED_CONFIG
++		if (strcmp(ctx->cffile, EMBEDDED_CONFIG) == 0)
++			return true;
++#endif
+ 		if (strcmp(ctx->cffile, path) == 0)
+ 			return true;
+ 	}
+-- 
+cgit v1.2.3
+
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 854b9abdd8a9..b21381cb678d 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,10 +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-97.4.467.tar.gz 96556504 BLAKE2B 1959c134126870e2d86b925766db9466be49fa0f71caeadac79f529194e85afeb4b45e47507a6786a2dc91cdb1cd976ec02110dac2c9d2abd71d789fd81204ac SHA512 fa056a96c1dd68f8c691c21b73d6d7159472616d2d67611a7ee01cb9b6bc4eeceed04087cb77114d6a62a715cbe82f828c6e75e4e92d3a4ce88ca7bbc2d71dd4
 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
+DIST dropbox-lnx.x86-99.4.501.tar.gz 97126978 BLAKE2B 38476b8c0b36c385c69c44588c5b3ea227a8f7db2b1bc08c75558dfae6e962c5f9df4ce82ddb8afaa53b4b6522ec37f2cc5cfffce6d5b293a64b98333c33641b SHA512 01d91cb5be1439fd1d2e47b93da570650cbc21aa4ba0bff05f066ed5c5a60d162a7a5e3eb343e6a2ca48709964b29570b94cc8702a1064a8fce0779acb6ea14e
 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
+DIST dropbox-lnx.x86_64-99.4.501.tar.gz 101375862 BLAKE2B 46c03250bd2c2d480b67a645c03fc8fc0343aeb5906afd1807b49bfb44d07606b59a61fa79fcad48cb4029969f457ef347d5f1394dbf53b10586bc05b068295e SHA512 4d8b350aa8cbc9cc5491c8978cbe56eb8e08110f48dd4187d7287a46847d8a4316158ea39e09e707a135a10424e8c6bc2a66b3cf4f9b8529fc0cbf755744a118
+EBUILD dropbox-98.4.158.ebuild 2546 BLAKE2B 615c2a5848135ecdbae88019b23218acf2114347a931bd345f660f1dc333bbdefbf304ec8c4069947af061e114dea8fe856bffcedbd91437b1300f979f12272f SHA512 88e21dfd4905e1c31114814243cf93b5f6e95302e2f90c7fde2b5c955f0789f1ca66c9b7b7372d2ec5c404d8e6788ce76e66b658151f28ec16020eb3c06aec7e
+EBUILD dropbox-99.4.501.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-98.4.158.ebuild b/net-misc/dropbox/dropbox-98.4.158.ebuild
index 38f892d3ba40..fdd08dee9730 100644
--- a/net-misc/dropbox/dropbox-98.4.158.ebuild
+++ b/net-misc/dropbox/dropbox-98.4.158.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-97.4.467.ebuild b/net-misc/dropbox/dropbox-99.4.501.ebuild
index fdd08dee9730..38f892d3ba40 100644
--- a/net-misc/dropbox/dropbox-97.4.467.ebuild
+++ b/net-misc/dropbox/dropbox-99.4.501.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/endlessh/Manifest b/net-misc/endlessh/Manifest
index facd783fd331..ff6e6263c138 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 1280 BLAKE2B d543e35271f1bfc4c7616e12a3cd4093aa85879a4184c8dd02a3c91204f12ed9c8c4cfd654a91cb112ca8688219ca2f56284e0848543f773ce37aae851a9b97f SHA512 9fbbfb758374d49b0446cdd3142f58d021bf306cce7fc9b8504ddbb7a03b10f96605146f729111edd3450bc7f8bb5624980e743c48d80a7c063e0f2308136cd9
+EBUILD endlessh-1.1.ebuild 1285 BLAKE2B abc2316e6a0100d31e4072be14167e8ca98344c2c9129da964d0d31ddee8c8ebb4c2483809dfa86b5c34dbe89e25e33c2791ed87591aeabfa8cc0b035087e7d2 SHA512 97de42b47d57f4aecd3ce1b03234a6a54b9655b0047c851364bbc35c4e3a139acbdb73c13d511dca65b7855dc1f284e42d81538adf060d35eca374c660aa30ef
 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 076f1f1161cc..89e86696bb7f 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 ~arm64 ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 56b2b37896aa..54291edae0d1 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,7 +1,8 @@
+AUX 2.1.1-write_pixel_16-endian.patch 752 BLAKE2B 6a7d28f90819a8f6d578d7c1f305141c5e189937e62bcd704d91041ea71a1121b5c60707b274dd762d524ecc9d198e74333a45f847d93d0139912082cc98196d SHA512 bf5ff1c57867106f19def3ef62da39d74239b8674ea07b8c8f404b9f47f1d9ba28460e04c13c68a19b27f933135688689b8ea4745aa7c82607c5e170da0d6489
 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.1.1-r1.ebuild 2900 BLAKE2B a9e27e7d78bf14a3ccd6a8ddb74d775d7c7e235a8a7a84d3626b765dd8478a69ce65853b9cf41ed759fc0e88c21cb32c91748b18c30e11a33e5af5cbab3a88bb SHA512 821fb34853a3297a7e21aab476812e87ac9156b000ebf49a46ba484c788c94345cfc37bd784d4c540f530ef3d1805f2c5cbdeacb90101c4578844bae3440c04b
 EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch b/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch
new file mode 100644
index 000000000000..f5d4d7638ad7
--- /dev/null
+++ b/net-misc/freerdp/files/2.1.1-write_pixel_16-endian.patch
@@ -0,0 +1,23 @@
+From 733026dada313cf345c3e3664cfe5790519e9fae Mon Sep 17 00:00:00 2001
+From: akallabeth <akallabeth@posteo.net>
+Date: Mon, 8 Jun 2020 07:09:07 +0200
+Subject: [PATCH] Fixed #6267: adjust write_pixel_16 endian handling
+
+---
+ libfreerdp/codec/interleaved.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libfreerdp/codec/interleaved.c b/libfreerdp/codec/interleaved.c
+index e9f92c7009..b76fe1ca3c 100644
+--- a/libfreerdp/codec/interleaved.c
++++ b/libfreerdp/codec/interleaved.c
+@@ -232,7 +232,8 @@ static INLINE void write_pixel_24(BYTE* _buf, UINT32 _pix)
+ 
+ static INLINE void write_pixel_16(BYTE* _buf, UINT16 _pix)
+ {
+-	*(UINT16*)_buf = _pix;
++	_buf[0] = _pix & 0xFF;
++	_buf[1] = (_pix >> 8) & 0xFF;
+ }
+ 
+ #undef DESTWRITEPIXEL
diff --git a/net-misc/freerdp/freerdp-2.1.1.ebuild b/net-misc/freerdp/freerdp-2.1.1-r1.ebuild
index 80ed08a506c6..ffab34deaee1 100644
--- a/net-misc/freerdp/freerdp-2.1.1.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${P/_/-}
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -88,6 +88,10 @@ BDEPEND="
 	) )
 "
 
+PATCHES=(
+	"${FILESDIR}/2.1.1-write_pixel_16-endian.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test ON OFF)
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index ca04ef01fcae..3f65065bea41 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -5,6 +5,6 @@ AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c
 DIST gerbera-1.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
 DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
 EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2
-EBUILD gerbera-1.5.0.ebuild 2374 BLAKE2B 0fc28c9d35b1c615a5880b9ecb19cd5d62a7024f2c07069bf1cca20cb79313b1ad0b03e12184f6310ed51cf03cbdddf41e877c263888b15960cf74727fbd4473 SHA512 d0ef6b689356d05365ce0e9e5046f1bc10173b8c8a56d6edee1bd84e6596fb063cf1bfeed2c07060de867efc7f24ce665e5ef61620f21da0b34b3d4e1dfa5ce7
-EBUILD gerbera-9999.ebuild 2309 BLAKE2B af7060d2acf0d50fb86c0a292e578a58be1971b189010b338047bf80b31e3cba3cf5fbe1ea69a6feb063bb1a00c9f5415e0096e44b83ba4cd32b08896f180a9f SHA512 236756bf69dc2f82b99d0297e142f99304e0798bb4f961caea1e2bd35317319ee4c20e43b6075ff0842b01d54d57f6c587c9a43277cc78d3053761b507a45b48
+EBUILD gerbera-1.5.0-r1.ebuild 2376 BLAKE2B 536362d7fddae6d2dc9b1846889e8757635512218edc73a909775b0b230d62429d721580e7cfbe7748faa93e0c1fa4710d778dc7e523e43e06eab027b5575070 SHA512 323b9a355a8691e7a76db7a28f4a151d840552de2f32b200e17e783aaa426b3d96bf0fc94c873db5860ac3f558fda03da2023806ab58a6cadb85a6eb1688bca7
+EBUILD gerbera-9999.ebuild 2311 BLAKE2B 4b344fd4a4d5951b490a97a23e5af37cd45a3a2bb2c7a73e6bf629cef25fbb76a95dad8cda6f1fa08f23761f7be0c7d455ddc8c45565615e2b3a94ac1fdcf79b SHA512 7b4330253af4df08e7aee9a66361f79762711511400cf211e5d4dc6655bf85614e395c853926ffd582e7b252cc83a96195ac4f32e27494f552ea84618b90c977
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.5.0.ebuild b/net-misc/gerbera/gerbera-1.5.0-r1.ebuild
index 3e0553c702d6..df9d236f5d0f 100644
--- a/net-misc/gerbera/gerbera-1.5.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.5.0-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	acct-user/gerbera
 	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
-	dev-libs/spdlog
+	dev-libs/spdlog:=
 	dev-libs/pugixml
 	dev-libs/libfmt:0/6
 	mysql? ( dev-db/mysql-connector-c )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index adb30342a7ad..7a452ed244cc 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	acct-user/gerbera
 	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
-	dev-libs/spdlog
+	dev-libs/spdlog:=
 	dev-libs/pugixml
 	dev-libs/libfmt:0/6
 	mysql? ( dev-db/mysql-connector-c )
diff --git a/net-misc/getdate/Manifest b/net-misc/getdate/Manifest
index 5dfe3074c562..838a3f6537c5 100644
--- a/net-misc/getdate/Manifest
+++ b/net-misc/getdate/Manifest
@@ -1,5 +1,5 @@
 AUX getdate-glibc-2.31.patch 403 BLAKE2B 7fb09ee4c4f6e610c7fadabc5739ede341d037e4c54288603ff351df9dae6105292b47768e6674fc921a67e753d833ce97d29aaafd2f49dba46c6e1d6d98d0a3 SHA512 6602d57061cc9116b7d7a4c649b8829a1b968378167a384e06adfa57661836617d63bfa27af060a84cddcf28be5ea7fa9e9ac085ed233dc123277fa74e671df7
 DIST getdate_rfc868-1.2.tar.gz 8323 BLAKE2B 03b9a9c0dd656fbb45785792484cfbce6e1f403f238a841bfc144401ad0deee257d88dcd214d617be2fd1ed0289e5ec63f0509effd51bd94b61be924b5f31836 SHA512 f4ce167e42f2ef54cb961923f15d8101c5d047659991b0f3859a0282d024b0e0273517b94b663a90f8d6af1d3e4acf46b96b17d39cd6b2f3ee25bc89995b1404
 EBUILD getdate-1.2-r1.ebuild 747 BLAKE2B 2485cf11fd9fb09a7955bce9d9b8c1e6d47673bf12e9bdabfcf27065e670373b4083b14b932f3f53ecbc9b7c9988c0c7c77ac1149da7f93e0f47e32ef3cc2d15 SHA512 b565d91d623326b4e5f2223d837b79176adbeda6ff174952766203501a766355eeaa6787e792c38700b0f37b54d1ba66e37ebdf57f7dca6296b93a977242b5f4
-EBUILD getdate-1.2-r2.ebuild 808 BLAKE2B 9817a685505940d2432f905da4438fb6de9bf06ab2a6dfa73f348385fb8414f783215fab93b1f41e35a3dd00a14299d5360a9590bfae4ec11e065b9c7c5334ea SHA512 9ba63991a44a9bc495900ebd0ae12a025c7981b20beb546b131f5d80749eec54feaa50790bca78362968fc49030cf690309bf9c770ab43da25360dfffc97e53e
+EBUILD getdate-1.2-r2.ebuild 805 BLAKE2B 6fddec9e9ab9cd795343a53c88b5d9959dd796f5e804699aa37d9edad8811c2a0da98ba8e45eca65e356c5ed713078ce7b2b879467239fefc8be02f01ae1f4f4 SHA512 03558000ece9b7698bb5e5be37e5cee00ac5d12e6b17339f3ce1081406e540b90d3cd87601bcf465830b9f3004757dd187b8a2a67924f7a07d73694c804d296b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/getdate/getdate-1.2-r2.ebuild b/net-misc/getdate/getdate-1.2-r2.ebuild
index 93e4e9d1d8e6..21c21d60ba86 100644
--- a/net-misc/getdate/getdate-1.2-r2.ebuild
+++ b/net-misc/getdate/getdate-1.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/system/network/misc/${MY_P}.tar.gz"
 
 LICENSE="GPL-1+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/ip-sentinel/Manifest b/net-misc/ip-sentinel/Manifest
index 8ecd673e62d4..93dd3169462c 100644
--- a/net-misc/ip-sentinel/Manifest
+++ b/net-misc/ip-sentinel/Manifest
@@ -1,6 +1,8 @@
+AUX ip-sentinel-0.12-fixed-dietlibc-compat-stuff.patch 2380 BLAKE2B 72d0d29028903238dad929c5fdc70fee1af4527cc85a5d0972be669bbeba8eec592dc2ca3b628c9c9c5c509204d666d1a95bc3be239a0fbb96c1528e0710351a SHA512 181080886851f1278da981a57c841aa2e618594453d84f714772c5dac872eebc73c2557ec224d0466744db9f40c3c99f77892240ea9f4d8c514c05c717e355bb
 AUX ip-sentinel.cfg 278 BLAKE2B bf582820bb9a22a0cb3e5b82ae934697c77d9f777e31ae1bec930a900e1fe36fe805167171f1900490fcc0247d77daee82533160c0d0881b92d9c19c026c3ee6 SHA512 315181c3ad90f677bb2ebca2309ae98cceb33ee74b0bae48138283c77612657a632af05a4467994b5b0981e835262f178515dfe8fb6787b4067ff749f97359d5
 AUX ip-sentinel.conf.d 357 BLAKE2B a8f08e6c63e4b1413f9021985086a573c4691c70f3d2f7447e0f23a4bfc80253b32971fff473e7ca1c71ee1f7bed192d2e8cd1ca01385153d156dc4bb1a25e7d SHA512 c35614e812cc0b3caea671cf2703493030f6de96f8b5afc80455c93f3e6181ddaf7eb6c22d8b63244f219b506db4bddfdf9792bf89ec17d7c56d274d003d4506
-AUX ip-sentinel.init 1051 BLAKE2B fc0e0165187d45a28440e8bbb70a915514dab04076c0f4a51d477bb92dd4a4014255562a538ae5a9005cb5d93b59d9f69251d8fb4cec66a76ae47dab5bdb1741 SHA512 025be17c390e0e07b60bd4dcc1c8ed33dbb51f53b1dc4037b25b9a1275c2b7043cf5e147124f3ef11481771c20ad20a0fcd9543cbab5294fd412192ad221257a
+AUX ip-sentinel.init 1047 BLAKE2B 3073e1145b94e93b08400a06ed7a0f0ba4a7d11bd996f4daaf3e27ca857dd2b5c74d30e644ebdc3a5fa1911ef378d3a9306a011d293f5d46d25f989c5f3ac44d SHA512 89729f42d31a81902e957e67089c0e3ead7f8e8f9554ef787bd6c05f210f231d56812a5dcf56d5be58c360dd31fa38873dfa17d1ae0423a80d1e93055853ed75
 DIST ip-sentinel-0.12.tar.bz2 165803 BLAKE2B 5b77dc771c432ddb556cc30cc9fce4226fed47958930cad4364af63146f8feeb5177542bccecbd276161acaa2232315022a59b8b83ba7763523886b4cb82b364 SHA512 dfa025fd96260073903ffe33dbaa5a146658dee2b8cb9bc04da0894a8de83207971a7f1e731128e42a0421052cdc352ed43a0298916f521d5f230533266e5077
+EBUILD ip-sentinel-0.12-r1.ebuild 2180 BLAKE2B a848bc02fb3e0e28e3eca77c5303bc6de17b476b82327aa9b7bbb26177441e0ec335316f2d1d7542b6a500511c08a04fc3c5ea6014c98dddda88a1228c6cffd2 SHA512 03f86d872cbafc7c24717c44719e8f468ff4e08748ab7656bb5783f25b803c94ad85736ea454756ff084bbb16084ce60b60c6dbee3d386360e925b19f31f9ae0
 EBUILD ip-sentinel-0.12.ebuild 2077 BLAKE2B aa22163ac0e315512e4a197b36c7b2a464875067ca27256b2e091c00f8b7d0647aa64220ebad81a164fc8deb8f76efe5d3444c9685c5fbb625ef8dab50e699f1 SHA512 09d5f004cc90df5f0460b8dfaddcd32e928d9b86e23e616acc784d02b7d77647d36de332c7f5c07cd784866b6c2926df46608123a4fe61543fa2d0765937b09e
 MISC metadata.xml 1303 BLAKE2B 7e42bf502035f8efb315fa524c938ff417f26dd88042ee673ffc9ed7aaa7efa52ef7a7ea08b7576bf32b8e213b6107c85b633967c261ead2349e78674793a36e SHA512 9ca404d2b97faf88cf40cf991584dfb1888e78b41817cc6dacfb2ac2bf13afdbb9c8496f61236e85ce2932c12d889975758108df0229760a16fa4478e5c0ffed
diff --git a/net-misc/ip-sentinel/files/ip-sentinel-0.12-fixed-dietlibc-compat-stuff.patch b/net-misc/ip-sentinel/files/ip-sentinel-0.12-fixed-dietlibc-compat-stuff.patch
new file mode 100644
index 000000000000..051956366fe0
--- /dev/null
+++ b/net-misc/ip-sentinel/files/ip-sentinel-0.12-fixed-dietlibc-compat-stuff.patch
@@ -0,0 +1,100 @@
+From ecf89e635de8778ebbf901279f7672e2c15e4ecb Mon Sep 17 00:00:00 2001
+From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+Date: Fri, 1 Aug 2008 09:20:46 +0200
+Subject: fixed dietlibc compatibility stuff
+
+removed lot of compatibility stuff which was needed for ancient
+dietlibc version.
+---
+ src/compat.h   | 31 ++-----------------------------
+ src/util.h     |  2 +-
+ src/wrappers.h |  1 +
+ 3 files changed, 4 insertions(+), 30 deletions(-)
+
+diff --git a/src/compat.h b/src/compat.h
+index c180185..c6fb409 100644
+--- a/src/compat.h
++++ b/src/compat.h
+@@ -19,22 +19,8 @@
+ #ifndef H_ENSC_IPSENTINEL_SRC_COMPAT_H
+ #define H_ENSC_IPSENTINEL_SRC_COMPAT_H
+ 
+-#if defined(__dietlibc__) && !defined(ENSC_DIETLIBC_C99) && defined(__STRICT_ANSI__) && defined(__STDC_VERSION__)
+-  // fixed in 0.25+
+-#  include <sys/cdefs.h>
+-#  undef inline
+-
+-#  undef  __STRICT_ANSI__
+-#  include <stdint.h>
+-#  define __STRICT_ANSI__
+-#endif
+-
+ #ifdef __dietlibc__
+-  // fixed in 0.27+
+-#  define ethhdr		ethhdrX
+-#  include <net/ethernet.h>
+-#  undef  ethhdr
+-
++struct ether_addr;
+ #  ifndef HAVE_DIET_ETHER_NTOA
+ char *			ether_ntoa(struct ether_addr const *addr);
+ #  endif
+@@ -44,22 +30,9 @@ struct ether_addr *	ether_aton_r(const char *asc, struct ether_addr *addr);
+ #  endif
+ #endif
+ 
+-
+-#ifndef __dietlibc__
+-#  include <stropts.h>
+-#else
+-#  include <sys/ioctl.h>
+-#endif
+-
+-#ifdef __dietlibc__
+-#  define sin	XsinX
+-#endif
+-#include <netinet/in.h>
+-#undef sin
+-
+-
+ #ifdef __dietlibc__
+ #include <net/if_arp.h>
++#include <net/ethernet.h>
+ #include <stdint.h>
+ 
+ struct  ether_arp {
+diff --git a/src/util.h b/src/util.h
+index 20381e3..adfe3a6 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -25,7 +25,6 @@
+ #include <unistd.h>
+ #include <net/ethernet.h>
+ 
+-
+   /*@-namechecks@*/
+ #ifndef __cplusplus
+ #  define cAsT_(X)              (X))
+@@ -77,6 +76,7 @@ xstrcat(char **dst, size_t *cnt, char const *src)
+   xstrcatn(dst, cnt, src, strlen(src));
+ }
+ 
++struct in_addr;
+ void writeUInt(int fd, unsigned int nr);
+ void writeMsgTimestamp(int fd);
+ void writeIP(int fd, struct in_addr);
+diff --git a/src/wrappers.h b/src/wrappers.h
+index e1be0ad..5548702 100644
+--- a/src/wrappers.h
++++ b/src/wrappers.h
+@@ -24,6 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
++#include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <errno.h>
+-- 
+cgit v1.2.1
+
diff --git a/net-misc/ip-sentinel/files/ip-sentinel.init b/net-misc/ip-sentinel/files/ip-sentinel.init
index 923cedeac13c..c839ca61d69b 100644
--- a/net-misc/ip-sentinel/files/ip-sentinel.init
+++ b/net-misc/ip-sentinel/files/ip-sentinel.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 CFG_FILE="/etc/ip-sentinel.cfg"
@@ -40,7 +40,7 @@ restart () {
 	echo "Please, wait while child process quit..."
 	while `ps aux | grep -v 'init.d' | grep [i]p-sentinel >/dev/null`
 	do
-		echo -n ". "
+		printf ". "
 		sleep 1
 	done
 	echo "[Done]"
diff --git a/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild b/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
new file mode 100644
index 000000000000..76e2d1db7e7f
--- /dev/null
+++ b/net-misc/ip-sentinel/ip-sentinel-0.12-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit user
+
+DESCRIPTION="Prevent unauthorized usage of IP addresses"
+HOMEPAGE="https://www.nongnu.org/ip-sentinel/"
+LICENSE="GPL-2"
+SRC_URI="https://savannah.nongnu.org/download/ip-sentinel/${P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+PATCHES=(
+	"${FILESDIR}"/${P}-fixed-dietlibc-compat-stuff.patch
+)
+
+pkg_setup() {
+	enewgroup ipsentinel
+	enewuser ipsentinel -1 -1 -1 ipsentinel
+}
+
+src_prepare() {
+	default
+
+	# disable failing tests
+	echo true > src/testsuite/prioqueue-check.sh
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/ip-sentinel.init ip-sentinel
+	newconfd "${FILESDIR}"/ip-sentinel.conf.d ip-sentinel
+
+	insinto /etc
+	newins "${FILESDIR}"/ip-sentinel.cfg ip-sentinel.cfg
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/ip-sentinel 2>/dev/null`
+
+	if [ ! -d "${CHROOT:=/chroot/ip-sentinel}" ] ; then
+		ebegin "Setting up the chroot directory"
+			mkdir -m 0755 -p "${CHROOT}/etc"
+			cp -R /etc/ip-sentinel.cfg "${CHROOT}/etc"
+		eend
+
+		if [ "`grep '^#[[:blank:]]\?CHROOT' /etc/conf.d/ip-sentinel`" ] ; then
+			sed -e '/^#[[:blank:]]\?CHROOT/s/^#[[:blank:]]\?//' \
+				-i /etc/conf.d/ip-sentinel
+		fi
+	else
+		eerror
+		eerror "${CHROOT} already exists. Quitting."
+		eerror
+	fi
+}
+
+pkg_postinst() {
+	elog "You can edit /etc/conf.d/ip-sentinel to customize startup daemon"
+	elog "settings."
+	elog
+	elog "Default ip-sentinel config is in /etc/ip-sentinel.cfg"
+	elog
+	elog "The ip-sentinel ebuild has chroot support."
+	elog "If you like to run ip-sentinel in chroot AND this is a new install OR"
+	elog "your ip-sentinel doesn't already run in chroot, simply run:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Before running the above command you might want to change the chroot"
+	elog "dir in /etc/conf.d/ip-sentinel, otherwise /chroot/ip-sentinel will be used."
+	echo
+	ewarn "And please! DO NOT START THIS DAEMON thoughtlessly."
+	ewarn "If you DO this will BLOCK ALL communication inside your ethernet"
+	ewarn "segment!!! If you have any doubts do not start ip-sentinel."
+}
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 3fedd1853d0a..c791ac41daaa 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -7,10 +7,12 @@ AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
 DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef67cbb0ce8050e30000465686466b30b699b2d8cb374be6b5a063ce220cb79e48fa8fd2257cce69cd8a90e8 SHA512 4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7
+DIST iperf-3.8.1.tar.gz 622721 BLAKE2B 8afcf0ba0ca9d82caf62eca1da4f656921f5b7b1e1b284533da57410db714744f5b3e80562d273a98bde7981e6204d309d36e8e6ebe399f4b4a8a94b02dbfd27 SHA512 3b551e2d603724374228682b316a0b1572f8630d51dcfed673b9d3df8589ce27679c27f3e9ce9539fabc111faa96fe5981778599076abe4f24b7a1d48ab63b09
 EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b86ed3a6cdb5c54751d566c1ebc35898a5781db563b0dbb499205b6b968007dce69ccbfa0ad5f4618898dc0a6 SHA512 7f7bfc1135d70d799ce97276967111e132a1f7b80ecc786b060dc5fad12fe0b1cc838d4919b1ced3fab3ac96ac0eb6d5a417b8381554217005eb6da49f3f8b3b
 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28
 EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5
 EBUILD iperf-3.7.ebuild 985 BLAKE2B 98d50eb4b100aef861017fe6cce8ff3513598095941e139df5d0f7fd7c59b5425cce4906e0d946b8ee6cba36214b827fde3f95dd4032cb55ac47a9a2c1d9eba3 SHA512 40ce051b5e9fa0f94245e9ac41da13d6f953d499158df675d042e3b5a0b994d6c7321caeaacafd40877982b30f825eb7c17d931764a106ff4d1d572bddb9b571
+EBUILD iperf-3.8.1.ebuild 975 BLAKE2B 9179c5b3879ca15b110dfbafd9f3bd308abd1362c891c5afa494dbd55805be513c98a23ccd390ed7161a99f071ae44013e87a1daa8db7a91d9b89bf4ee18eb8a SHA512 2aaf7b025a881a58f72b1903fb53998cb9f1b890276d6ef980c20b437d44f9ce65018af456c41cb49f032f92b101eac8e3562bd2ef04c352802d14843e9b57a3
 EBUILD iperf-3.99999.99999.ebuild 831 BLAKE2B 14b3ad32e35b19fd52f3f4dd31d09e4de30300d200a46e3e32edbfac2ed70a0c93ef2270483327583d61bbb456b61ea73f34c0307c3435c2168f9c442ff24c2d SHA512 aa529bc4e36feff38054349e61338d1152bbfa379ca0eea9d77f8b339ce53ab5c93e10ced57ffc40d1515c95b87532f7548434468c56e5a059a5a873c176b1de
 MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
diff --git a/net-misc/iperf/iperf-3.8.1.ebuild b/net-misc/iperf/iperf-3.8.1.ebuild
new file mode 100644
index 000000000000..cb655f6b4782
--- /dev/null
+++ b/net-misc/iperf/iperf-3.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
+HOMEPAGE="https://github.com/esnet/iperf/"
+SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+IUSE="libressl profiling sctp static-libs"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="
+	${DEPEND}
+"
+S=${WORKDIR}/${P/_/}
+DOCS="README.md RELNOTES.md"
+
+src_configure() {
+	econf \
+		$(use_enable profiling) \
+		$(use_enable static-libs static) \
+		$(use_with sctp)
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/iperf.confd iperf3
+	newinitd "${FILESDIR}"/iperf3.initd iperf3
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 483cbdf0d27e..039cda7c5b54 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,5 +1,3 @@
-DIST linuxptp-1.8.tgz 147764 BLAKE2B f0dec589cf4f27c03f901262980f1c471382eefdd00772da0065077bab29ed7c1350d70b1ec4b0c912dd82304220b9c550320b82cf269d99478d40c5a7ed8541 SHA512 8ac52428b7addf1c43769083e660ca0ceb2813994107b8b9c59338e480f1d2e45666ebcc3f59f7b8cf9a02301b55aa54b26cbbbf81622a525a704f2d08fd383e
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-EBUILD linuxptp-1.8.ebuild 722 BLAKE2B 97d6de01f6ff2ee009d29ba9b88a998548ec5dcc04b22bc60ecf045dafd34e4e00167f1856336a105e5041cc622655fb063301b25079c0f4b3fc0fa2f81109e8 SHA512 00c6f58bce0eff4bff18e7efe2ca3ecac87c827b17b9dd3ca0eac8b882ac4508ee854f4ac36f3d72b2d85e2d6b48393a4ff96b127655aa1a3b202dc1808a4716
-EBUILD linuxptp-2.0.ebuild 722 BLAKE2B 4e2fa0cf213c2c68a33b0421d739aac77a30d10bd427cf3fff04ae323f47797cc0dea6c900a2939cae70c77fbf731626494fe75147a693b9d23d7abd07f21798 SHA512 060f6868ef72d2aacf5c1f2ed2322feb7bbe1f4f5733b0b2c4157da9b30d43daa828c440aa38b73960e88e67341b1f244a89b568ca080173e38e460be4adfa75
+EBUILD linuxptp-2.0.ebuild 762 BLAKE2B 4aae3a869826fc311459f7bb2aeda456c6ab3cb09378842361b85f8e98a7915550451c4d9efd67f1fe751b6e78cee5fd99e13731b4e7b175cb99cb4e5ee8d964 SHA512 85bb3b3f52ca6744b33fa4e04d0e5bf96698c90bf2bc442edca4e11ac6741437f68e3d34019acfc5cc927a674bf0b2afcd4c96c03ab27f7f0204cf09a44cd5d0
 MISC metadata.xml 445 BLAKE2B abfb043154cd84cb3a40212f54d9be67e89bfda3f83cdb9a8d65d8032b8d1f0a0b8dcfb4fdbaa5ed303dfa65f35715ee714a84026b730c26964a1e06a41b32e2 SHA512 6016bb962e61088156d9f2b78d8dfc0f4b07e6a22016d7d591459b8254ef42798c902a2cdfe183972703d3c1911ab48d7b3c95a0bc1b470a4dcc1a34ea66d232
diff --git a/net-misc/linuxptp/linuxptp-1.8.ebuild b/net-misc/linuxptp/linuxptp-1.8.ebuild
deleted file mode 100644
index aa5a2f7ccf00..000000000000
--- a/net-misc/linuxptp/linuxptp-1.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit linux-info
-
-DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
-HOMEPAGE="http://linuxptp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
-
-src_compile() {
-	export EXTRA_CFLAGS=${CFLAGS}
-	emake prefix=/usr mandir=/usr/share/man
-}
-
-src_install() {
-	emake \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		libdir="${D}"/usr/$(get_libdir) \
-		install
-
-	dodoc README.org
-}
diff --git a/net-misc/linuxptp/linuxptp-2.0.ebuild b/net-misc/linuxptp/linuxptp-2.0.ebuild
index 3d391a525a97..716fbf22a46d 100644
--- a/net-misc/linuxptp/linuxptp-2.0.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="The Linux Precision Time Protocol (PTP) implementation"
 HOMEPAGE="http://linuxptp.sourceforge.net/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -21,7 +21,7 @@ CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
 
 src_compile() {
 	export EXTRA_CFLAGS=${CFLAGS}
-	emake prefix=/usr mandir=/usr/share/man
+	emake CC="$(tc-getCC)" prefix=/usr mandir=/usr/share/man
 }
 
 src_install() {
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 38a28fdb6fbd..692a04756ce7 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -14,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 2358 BLAKE2B 7c4ce6ad02ec5850536efce7e0b32b93766a3741a896dcf796871c823d1f0b44670ff0e537c5164d5e01144165b60a65e30bb3b160991b4c6bdbc1c82a580929 SHA512 ca685b258e2912fd2c01847f506305d9ed6f0357b46157a17c5fd76112396fecf74bd6f1409b8d234f859fb2e31bbbe6757e536c1991c4a013c53d59d0bae5af
+EBUILD lldpd-1.0.5-r1.ebuild 2357 BLAKE2B 04b7ba279eb7904e470c98bbe3febfeaa9884a2e1f9cc1ed2f7688e6705cafb9e6d5d0bff3418f0b840e787a6134ab8a07b75c003c5aa567575064856b78f525 SHA512 fe4706dcaccc0f84651d9492ff1ede2e47101548c34f4f7dc780bd6a4e952534342a4fc2c77f2c400037705df6eb490a9548ac76466841db56e17225d37805e0
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
index 8a440b4d037b..1223cf5d1a01 100644
--- a/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/4.8.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index de72e03c882d..c6b72319c248 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -3,8 +3,6 @@ AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 BLAKE2B 1d0d66a9ec44855215a
 AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a802b2bbcf5af3f7bcc1de26305951e0396c879ceb2b651f21b199df0ffabdfcb739626111d0e086d12736603500860453bd SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc
 AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec1ffe6f9d47a5a1e3b676f70d25a675d4b4762a4d69915a81cc0e30036e74254ce08f93b625bc842ae0e4a6d7520798f85 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e
 AUX memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch 1470 BLAKE2B 987f8ff094ae43e8fe94458b70f413b994f0125b16987b7aca56bb0847f3c6ff10372cff4a4f12fa651cad72601fef6b4a45cfe0c05036e264f9c53f5846e686 SHA512 c0c139d82762c397cfb86307ab989b3c0a31547e3bccb8b13b4537e78b7f62a4b92aafc60e5cb092098a95038a9f93e8ee6be8702b130fafa11c81112a1fce69
-AUX memcached-1.6.0-gcc10.patch 1345 BLAKE2B 11c090522e694b640880606615f97303e07b35e1fe399bde38ff5fb22355287b3cee2690fc3f00ac05b2c834e5bf94bec48b8ee64b47c226e2517ea0694dba72 SHA512 59c7cc5060dc3e09d991223f5eca8b951c114e2b6e61a56089ad559d376e1e002b653a1ac8ae5556dafeb6d3fda911a4ab07f41b89e1a4474aba00921a393a10
-AUX memcached-1.6.5-ia64.patch 1862 BLAKE2B a93ff1412d52a1c541a1c4a5dc5cf50e29a4f58e60dd2263a711d6a048510654e8a0a35b73eb7e65f33758fd9c2de458725988b0ae023c392840a714e17b0ba4 SHA512 06454cf3f39a0d5de6f0a8caaa822a7559dd7aeccc7eb366eacd54a5ef9eb7b8662c46f482b6518eb0a26e2c18a8f9971632b6182c4ede925f344cd73e57f211
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
diff --git a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
deleted file mode 100644
index d250b31e9129..000000000000
--- a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Subject: [PATCH] crc32c: fix multiple definitions
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-By: Toralf Förster <toralf@gentoo.org>
-Bug: https://bugs.gentoo.org/711982
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.c memcached-1.6.0/crc32c.c
---- memcached-1.6.0.orig/crc32c.c	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.c	2020-03-10 22:19:07.610247164 -0700
-@@ -390,6 +390,7 @@
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
-+crc_func crc32c;
- void crc32c_init(void) {
-     #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-     int sse42;
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.h memcached-1.6.0/crc32c.h
---- memcached-1.6.0.orig/crc32c.h	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.h	2020-03-10 22:17:12.086974212 -0700
-@@ -2,7 +2,7 @@
- #define    CRC32C_H
- 
- typedef uint32_t (*crc_func)(uint32_t crc, const void *buf, size_t len);
--crc_func crc32c;
-+extern crc_func crc32c;
- 
- void crc32c_init(void);
- 
diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
deleted file mode 100644
index 5a73913b92e6..000000000000
--- a/net-misc/memcached/files/memcached-1.6.5-ia64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/memcached/memcached/commit/73633d31b22068dfda5ef969c08139c083d96d71.patch
-
-From 73633d31b22068dfda5ef969c08139c083d96d71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 Apr 2020 10:08:19 +0100
-Subject: [PATCH] crc32c.c: don't attempt to enable hardware crc32 on ia64
-
-Itanium has no hardware crc32 implementation and build fails as:
-
-```
-ia64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I.  -DNDEBUG   -g -O2 -pthread \
-    ... -c -o memcached-crc32c.o `test -f 'crc32c.c' || echo './'`crc32c.c
-crc32c.c: In function 'crc32c_init':
-crc32c.c:385:9: error: unknown register name '%edx' in 'asm'
-  385 |         __asm__("cpuid" \
-      |         ^~~~~~~
-```
-
-The change removes ia64 from crc32 paths.
-
-Bug: https://bugs.gentoo.org/718136
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- crc32c.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/crc32c.c
-+++ b/crc32c.c
-@@ -167,7 +167,7 @@ static uint32_t crc32c_hw_aarch64(uint32_t crc, const void* buf, size_t len)
- #endif
- 
- /* Apply if the platform is intel */
--#if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+#if defined(__X86_64__)||defined(__x86_64__)
- 
- /* Multiply a matrix times a vector over the Galois field of two elements,
-    GF(2).  Each element is a bit in an unsigned integer.  mat must have at
-@@ -388,12 +388,11 @@ static uint32_t crc32c_hw(uint32_t crc, const void *buf, size_t len)
-                 : "%ebx", "%edx"); \
-         (have) = (ecx >> 20) & 1; \
-     } while (0)
--
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
- void crc32c_init(void) {
--    #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+    #if defined(__X86_64__)||defined(__x86_64__)
-     int sse42;
-     SSE42(sse42);
- 
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index addb60c2a35b..3e065806868e 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,6 +1,6 @@
 AUX mikutter 136 BLAKE2B ba1a252d63dc3a190f61ad3f0489ac7222a90d48dc01cdaadb24f02d870ef64d0fd20b5c913f8469b590ab4b961accfcb14b7b7d7fa1542fbf0b938dac35024d SHA512 bae3b58b6983c7ad6e0c10f006f4338eb0923b1056b6f74f518a1b3caeeef7c414f8de8dd927420611ae8542dde8507f1c25ca0529e7cd3a17f6ac8fc25e16b0
 DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-3.8.6.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
-EBUILD mikutter-9999.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
+EBUILD mikutter-3.8.6.ebuild 2840 BLAKE2B d01f0074662996140f804692080df7f3e880c0aa57101abdee30a0677063a727f8ecde32e4762933aab0d327ac6cfe469ea6acbaf52df4eb9e9d343f540aa695 SHA512 21215df11bad9e6ed1e112ad5138a8ec0c8fadd9fce5fa8ac28675a924c9d4ba0be597b603d605efeee1ee8c4825067b84dc802098db9b1992917f9d4f35ba08
+EBUILD mikutter-9999.ebuild 2840 BLAKE2B d01f0074662996140f804692080df7f3e880c0aa57101abdee30a0677063a727f8ecde32e4762933aab0d327ac6cfe469ea6acbaf52df4eb9e9d343f540aa695 SHA512 21215df11bad9e6ed1e112ad5138a8ec0c8fadd9fce5fa8ac28675a924c9d4ba0be597b603d605efeee1ee8c4825067b84dc802098db9b1992917f9d4f35ba08
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-3.8.6.ebuild b/net-misc/mikutter/mikutter-3.8.6.ebuild
index 06d5346485a6..54fc8e5670f4 100644
--- a/net-misc/mikutter/mikutter-3.8.6.ebuild
+++ b/net-misc/mikutter/mikutter-3.8.6.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
@@ -18,14 +18,14 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz
+	SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
 	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
+HOMEPAGE="https://mikutter.hachune.net/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 06d5346485a6..54fc8e5670f4 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.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
@@ -18,14 +18,14 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz
+	SRC_URI="https://mikutter.hachune.net/bin/${MY_P}.tar.gz
 		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
 	RUBY_S="${PN}"
 fi
 
 DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
+HOMEPAGE="https://mikutter.hachune.net/"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index b8671d266016..fb0445e4ba88 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -4,6 +4,6 @@ AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d45
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-36.diff.gz 27226 BLAKE2B c19370f6462295bb7e8d09307121ec3356e9d1751b3ce5b7985844f54506351f633de381ffb3cd3209995c1826aaaa9ce716084742d4689d626b28aee8a3eb43 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
-EBUILD netkit-telnetd-0.17-r10.ebuild 2477 BLAKE2B 7719524ef10775ac242aff780e1d272cd1b064577dcc45b83c3a974ac4923a88735859071c5c1403c3d5118a8e5944fe05b3f4f52b4818279e157146a6b2676a SHA512 dc261e2c8a9cbc0555fb6d4016f6914002630449fe74ce152d0eba4db15f31cc88d0608b40d8a2c12d2c0de999abd333ee8f571ac28370ac3cfa565d6415810d
+EBUILD netkit-telnetd-0.17-r10.ebuild 2483 BLAKE2B 92bef79a3be411c680ad49651eba5e07fb3b1067f06b1f492d0bb292e2c67cbcf2ea841fff6e5620fadc9e7994ec1d7b497c4f4214588df9a3caa8c7691474b6 SHA512 fc3994a97d7910099e74e35387ac83517da200f6e815d2d6e189ba4f962edf573ad149f02dbbd98ddf0621967c5000385eb2db8203af4cb4297b158e1700a3c7
 EBUILD netkit-telnetd-0.17-r12.ebuild 2510 BLAKE2B 1447a3df0ac3d8a8081b90f7af273ee9932ba23959ef049af94c17ad9315afe1a74ae15723d16b06f4fba1300f443c05a46e4d91be9c67c0b8d6a27dd088f8b1 SHA512 f3607be170eb971ec43de23dc72948993a7d1700dee068f021ee6e66aa28262fd748748dcb49aa5238c4966498278bc4a2775f5ffebb2b1fa6350c24b7a6f8d2
 MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
index 9d8090cf6e5b..4bbca3926ced 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2:=
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 1b4b1766af56..834429a9ee51 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,8 +8,14 @@ AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 17
 AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
 DIST NetworkManager-1.18.6.tar.xz 4845144 BLAKE2B cf66789c025d9ec2007d1fe541acb8fd2b5204796ff8498fc5689124016e84a7e76509bee1b6650c796f0429cce6748c7b99e1976d95ac12bc31a1f1e67289b0 SHA512 92ab648e689dd903279fe676e867d7929f616c96dd478b2132854145a29debfcac5b083d70652ea0c7bccb0eb132534133fc9c005527237c47e2802556a29b92
+DIST NetworkManager-1.20.12.tar.xz 4663320 BLAKE2B c0faab91a50ee38d6c884dd4f753d642e5c21c268814cd6badc8a8dc3b654f54d1ff60b362d6e3cb4b254218618f16dd7a1fde153879907b5b3538a92086e5af SHA512 97dacee9b0720b864c941c139579d84d98d1b2f74dfc97fd0a6ed35ed9ae0b45d40553f8d79c4d7c4d3958228a2e6035555069c94040ecbe4a34457bce8d5f60
 DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
+DIST NetworkManager-1.22.14.tar.xz 4771180 BLAKE2B d0133c2de2fd8a7932be7699bcef7e8e32083e6f908de0eaa3875a862329a1a302245d66dbba8a90a691245897b7a943a35785da21f394a7cf2659eb9cceb866 SHA512 81ccb634c3583406d52c159d1b0903f98c2732f9cd6962f3d6d71940d05cba32e262219de4f09c0cc687beff57bd7ba425f06d9a9c1bfa60aef11d427e91f453
+DIST NetworkManager-1.24.2.tar.xz 4848624 BLAKE2B f8030159d6f645c3015cfb9cf41ffbf30f052592e04c27a2a378e6d7c0ac86f521a5147229b84e68adb7835ebac8b8ad094977f0783b3fa794149190d809a098 SHA512 34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923
 EBUILD networkmanager-1.18.4-r3.ebuild 11451 BLAKE2B a40e6bf41b7fe4c2eeeb2bf37c04e3a49bd9b7cc98c742e4632d094d232130a89a3009bd560ec860e3cf63b080dc0e8acb9d2e63989161eb3a0bf8c4a95109a5 SHA512 1aaa83f0540d0445cd22a5de38da6d9f93b12a99797bfe053143e17ab64994cff063f590144e9eede46a7e32b7ebef6bc0c24a15522e8f305960a539d9592933
-EBUILD networkmanager-1.18.6.ebuild 11458 BLAKE2B d934baf78c6c0960910870de17597a1ac3705177c300a3eb30fff1a222168c863253f890da9f4987b22699cc675d93724ec89b441767102d989f5dcf3c5cb8da SHA512 99ee25dc331584361cd5f655b5f0e57d6d990d7272cf411c27c1477e58efe3303109ff53e5a3b4b473f61ace2b2871aac0a187194ecaced07477d27280a3d8cb
+EBUILD networkmanager-1.18.6.ebuild 11452 BLAKE2B afb89ff877dfa2717c243bb60300be725ecdb516da3644e1cb84f97861b399c3519e1ecf34031bc13b2675815b15099de15e434f6bd977ddc559403e3c0e5b43 SHA512 f587d21cc707389294f157da3bf35cb4811162ed5cb737200ae6a919ce82a88620ce2f4e90f9f45e5e925c66ec6e1d5946dc788658bd1315999a03d542fb6ef7
+EBUILD networkmanager-1.20.12.ebuild 11108 BLAKE2B 2ba77fc23bc2d3bb8170c506624bcc496d8235093a834d87303b0280bb4df634dd590cc4ad99fbd0caf1874176c88b0cccf965a39139d8f4367cdfee43b25b46 SHA512 7044f843cc607a0f54855b16d924ff7f0a6d74821bfe61c6df73aa3904707937285edf3d188a12b0615553d58e827e9e57765a99a0018a140843d5d649fc2c34
 EBUILD networkmanager-1.22.10-r11.ebuild 8778 BLAKE2B cfcb2044f5f9d7bfef67cfda7d58d032ca9e2cce7e9a0ee0fd64caa9875c6f6873a01823f4b56a1ecd25680dba145bf5688c580f5c465601eaef0313ebf65381 SHA512 a271e30d97f2effe6b12a168c10e4a898bb0c4105c73525db4c864cb9ab0b2a2bc3241a74f22f74fa7f1a5d6d99fdbbc528be5c28c77a2cd1adcfc159ed1e7d4
+EBUILD networkmanager-1.22.14.ebuild 11223 BLAKE2B 0b05a6131305a5b3b1df3104560b287f225a2e9b97ff915ec016bc39ca2c599877669b0b921350436383e3fca09a08e6f5ff7fc07f184ae45caa7fdbcc4e0be1 SHA512 28aa546fd5fc8c66f6e0aa82fa7732bfe9a76c10eb21ac13075817239c665f3a5cf51cfbad34135545def115f70d52f8f0b55dfb6903eff28694d4f5564ce493
+EBUILD networkmanager-1.24.2.ebuild 11168 BLAKE2B 8e8bad3ae67356aa17677eec8eac20edfc5858b4ad87dd41e65b06d3ae1efacc6ea4d1920a982a2ad73a7de42428714f774c0041ecc20432ae770e5f7a4a9714 SHA512 b8c334e7e05aa268c16a2d0e41ec423521c6daca7ad94392a8657c1a901dbd31dd25d42d169772f1f1941297bcc5f4f211d480be0462a4f590a1f4a27c942fb2
 MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89
diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
index b410b2553ee6..0a6bc3c37e28 100644
--- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/networkmanager/networkmanager-1.20.12.ebuild b/net-misc/networkmanager/networkmanager-1.20.12.ebuild
new file mode 100644
index 000000000000..1a1c31156f67
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.20.12.ebuild
@@ -0,0 +1,339 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		# ConsoleKit has no build-time dependency, so use it as the default case.
+		# There is no off switch, and we do not support upower.
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable policykit polkit-agent)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.22.14.ebuild b/net-misc/networkmanager/networkmanager-1.22.14.ebuild
new file mode 100644
index 000000000000..7a59df42aa19
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.22.14.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		# ConsoleKit has no build-time dependency, so use it as the default case.
+		# There is no off switch, and we do not support upower.
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable policykit polkit-agent)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/networkmanager/networkmanager-1.24.2.ebuild b/net-misc/networkmanager/networkmanager-1.24.2.ebuild
new file mode 100644
index 000000000000..0082e77dbf99
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.24.2.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing consolekit dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		# ConsoleKit has no build-time dependency, so use it as the default case.
+		# There is no off switch, and we do not support upower.
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 3ab775046742..76cfb8c07ce0 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,10 +1,7 @@
 AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
+AUX nextcloud-client-2.6.4-qt515.patch 678 BLAKE2B 767ff6f3bb4ecd9ff6e87484d8e2b74b7c8f1753b71d5037f98838fa8ea5c78f63a75b66b8ee8cbd20f48a47296603136f525e090f0f625ee15e1fe6a6e688ac SHA512 19caea8c5b8b14db7af6520e72b4e4e2f20b45e6c6c8dcd2e1b0de5d8abd8d274127bb50fc16ba448d9fea189fc5cfb8c5f1e0d7c6d00661a2738ac959156049
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
-DIST nextcloud-client-2.6.2.tar.gz 18982053 BLAKE2B 53f4d13b42f50a272012909ed5c937b0a37543f11b8ef0119db670107ed10629d79cb2fcfbbe9148ff847f7ef9e38183f613ae3162206bf9e8f7424ae8280b72 SHA512 b56a7d6751381ffb546b0c8a4b9dbb7991f523ac2ff06dbc87ee36927a4326f57f520ea96a2116ead5d36db6b9900f552834ec9dff8ad5adf80e896829428199
-DIST nextcloud-client-2.6.3.tar.gz 18983292 BLAKE2B 89fdb35c12f4d126c19f31d09d54e027f9edf684fa4904bfba0e7c49a628295aabe00f2b6bc79496876a252dbc9d82772a95bcc59ae4220f8c91dd09bd2661d9 SHA512 ddeb8a32e0208bc415bf421cb3ce05713adb617fa78c0b5cb4d894c9e8d3499dcc495c115de3ea7abb0c402eef4bc64ede8c59a7f056acda47779096fedc8025
 DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1
 EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
-EBUILD nextcloud-client-2.6.2.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d
-EBUILD nextcloud-client-2.6.3.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d
-EBUILD nextcloud-client-2.6.4.ebuild 2032 BLAKE2B 021d61158a3c0a0516690db20246e5fd55b3f95f1728250f776bc3f4564a8a18879c45c0aa76c14c37f1494bbe1b187a93915aee06f2511e411bff8ad533db46 SHA512 ab6ea6a2c29560330b75e538c387f6e393e53ff935f4a07b9772c0f2f7ef26a4bbad2ec573a826cef64ac1f3787aaefeb74e454d26543067cd8729480572e53d
+EBUILD nextcloud-client-2.6.4.ebuild 2065 BLAKE2B df0c4509008bb3543d7e62a4edba47b0b9a826598b5c1de227a0d958626b24054db79b6664341777bdcf6636a19c0c757a09e0677fdbee561205597c73e9ba06 SHA512 f569089d81fba7bec1c4659ee7776303356283795717a522a6aac8e38e02699ce538d351716e4560b9e4ce9f28834158b0b7d284436cf99b29c022dd22585fc6
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
new file mode 100644
index 000000000000..5c59cf46bf39
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
@@ -0,0 +1,22 @@
+From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001
+From: Michael Schuster <michael@schuster.ms>
+Date: Sun, 7 Jun 2020 02:43:45 +0200
+Subject: [PATCH] Fix Qt 5.15.0 build error (missing include)
+
+Signed-off-by: Michael Schuster <michael@schuster.ms>
+---
+ src/libsync/networkjobs.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
+index fd63b9606..bb5786ea9 100644
+--- a/src/libsync/networkjobs.cpp
++++ b/src/libsync/networkjobs.cpp
+@@ -31,6 +31,7 @@
+ #include <QJsonDocument>
+ #include <QJsonObject>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "networkjobs.h"
+ #include "account.h"
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild
deleted file mode 100644
index 0efd5f09b271..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch )
-
-S=${WORKDIR}/desktop-${PV/_/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild
deleted file mode 100644
index 0efd5f09b271..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch )
-
-S=${WORKDIR}/desktop-${PV/_/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
index 0efd5f09b271..655fcb79a2b3 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
@@ -51,7 +51,9 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch
+	"${FILESDIR}"/${P}-qt515.patch
+	)
 
 S=${WORKDIR}/desktop-${PV/_/-}
 
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index fd7b7be5201f..2cb1838f3cbe 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -12,9 +12,9 @@ DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67f
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
-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 4368 BLAKE2B 90410cda8d74701a66155f39566efdf647e62493ba7c1bb3e209c8d28ead2ca940118759769dd7f70b332d959ff5555abe3f50c2e84cb07b7c7c16ed8463b69e SHA512 c7f39cf40833679033943a501a751b2282f0123fca5b897e0b0805ab5b17d3c427d4b4a915e1e00a966574dabfa3da445978a4dfaacb9a71b66ebec8bbaee02a
-EBUILD ntpsec-9999.ebuild 4105 BLAKE2B 3acb680474e27deb351ea4fdb0cea659995103c7f7f3ffe2670851b551ee7567d98b5db094cfadc56fdbf551296d37074d6747f5cedbcfd700801ee7e04ed2e3 SHA512 4f35b54362bbb6eba38e93ba05d725cf5a8b5fa0bcaa4f9a4a0b15537b1e0939450ba1b23892a9a6b19c1fee74454d1f50af7ff4025761fbd36dedd6eeb3c48f
+EBUILD ntpsec-1.1.4.ebuild 4106 BLAKE2B acd5647b4bee47d39408bf0a4864aef548c72ca49cdeb37acb043a3e922b01585eed53b27a98cabe4c8042812015076a74a5d182d18925090967d0b928855efa SHA512 0ff66468930664032e1380058b0fa5dc1dd52112b585ba0e1ce467864795046687291eb8b2a22e1047ca2caa0cffe4ad4da21edad988257eacdf3ba1c43a97fe
+EBUILD ntpsec-1.1.6.ebuild 4064 BLAKE2B 965b62889053c25f2aacbc47c3fc046f042a0d222b199f59bf03f245b6dee5f647eaf294c391a4b711a3e404d1111800033bb1216ac77c5554057e0adf35124d SHA512 4c2f6dfaff5ba632e78ae80d9476a107894cdfb33ab7b8608fddd7de06f077baa9ea14f713119d30078920e53f08435a1d623ee787c2c6bdbc85c7477b7d4253
+EBUILD ntpsec-1.1.7-r1.ebuild 4157 BLAKE2B 9c992edfdb1ce011c07190c1f91da6eae3f8dada516587a94ea9a5aa2feedfc904583b63bca288df2301d8b2ae58d7353a822ee9ece4c34c99243076f776b0a2 SHA512 8afda370b45d2048f10c7f3122d67af4c45204b021a5ad62e686c35c79c59fed627cedb6d39653560354b692614222bbafd46938a2620a423defa6816f170f13
+EBUILD ntpsec-1.1.8.ebuild 4345 BLAKE2B 5912cebcb1f7315538293b3c0c332abaa43525b2d78c89d8d1bdda102bdfbcfb2c01a48ce599911952708ffac64a25607844d198d0f2bd43175f749fcf96a3bb SHA512 239de4704281175438c76099ecb03726ce467c811077e2d11b11671ebde6d102ecdf50838eaeae94484daa4af48bee5b2e336df440888f64fc4e599d8da69702
+EBUILD ntpsec-9999.ebuild 4069 BLAKE2B 4ba68e1c227e7baf2b3a9305dae9eb756333bc863ec10a0f0c7b98c91327f6e0727e4cd510ef63f36d93971a004f2cf7e46fde753928456e38eb92d4856b767a SHA512 c9be282b8b99060c6f9ca84c3a07e692b99c0e278e5f6848403f911b1830212f1a67ccb8b1ffe024d9a37efa24e8f1da7fc31271fcdc9415b8799d9845eb1b03
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
index 213ae93609a5..7af091fcc99f 100644
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index 67b24ffac50b..4b8a3d2699be 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
index b9f7fcb422b8..c739bc481134 100644
--- a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
@@ -12,7 +12,6 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
index 9da748d10037..9c6f4b05b299 100644
--- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
@@ -12,12 +12,11 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	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/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 36dc8d080881..deb37a522fed 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -17,7 +17,6 @@ else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
 	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index e56110747565..455eebef4bcd 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,5 +1,8 @@
 AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3
 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
+AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c
 DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0
+DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 EBUILD oidentd-2.4.0.ebuild 1181 BLAKE2B e7dfd55712c91fa3073ac2e49a7e2f6360fc4804bb3aa64971dae63addfa814de422657358ede9510087787b869b9f5c95aaad7b4e26f7cd9eed1549128ae06b SHA512 dcaba59488562d2758972307cb5ea0bd99d11ae2cec142d64fe54f2adfe9df085959f91733a117dd35ce3684899a3d7d087791230506339ca7bd3937346aede0
+EBUILD oidentd-2.5.0.ebuild 1259 BLAKE2B 45b92137129317d9ec7f1089bb6b44a0627c1436c937a20ddefd75ea410bea53b63766345927263ccae06424968020d1cad14888a03bc161274eaac8dab32191 SHA512 00d0dda12a7428eb39750084f02a834b56da6980a7bcbec38afef52d1fbc61c44854b47935ef8f17401f6d1228ef3e248e261749cdecec48b530bf79a4582917
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
new file mode 100644
index 000000000000..156b136f7755
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index b458d11..b163128 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,6 +32,7 @@ AC_PROG_LEX
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ AC_PATH_PROG(sedpath, sed)
++AM_PROG_AR
+ 
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
diff --git a/net-misc/oidentd/oidentd-2.5.0.ebuild b/net-misc/oidentd/oidentd-2.5.0.ebuild
new file mode 100644
index 000000000000..ceb7d227fd8e
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="https://oidentd.janikrabe.com/"
+SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug ipv6 masquerade selinux"
+
+DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
+
+RDEPEND="
+	acct-user/oidentd
+	acct-group/oidentd
+	selinux? ( sec-policy/selinux-oident )
+	${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-respect-ar.patch" )
+
+src_prepare() {
+	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_enable masquerade libnfct)
+		$(use_enable masquerade nat)
+		--enable-xdgbdir
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
+
+	systemd_dounit contrib/systemd/${PN}@.service
+	systemd_dounit contrib/systemd/${PN}.socket
+	systemd_dounit contrib/systemd/${PN}.service
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 1b9814a04852..aecdd0b25fd5 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-X509-glue-12.5.1.patch 1721 BLAKE2B c67e6ce756d8febea9066ca52d47baff962075610ca87ee8ef9581940db020ab8889f1bb7e2809bac7c521058e835a25823f30bd6ee8b4948cbb19b7459e512c SHA512 bf356de43307cb48fd79427b22fff5bf40ad4fc72c6e906b517209f5f51bddf6a5f81d7617ad01e8434db5703df4fa45f68d4a70fd5869691536b9f82fb18b18
 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
@@ -39,6 +40,7 @@ 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+x509-12.5.1.diff.gz 803054 BLAKE2B ec88959b4e3328e70d6f136f3d5bebced2e555de3ea40f55c535ca8a30a0eed84d177ad966e5bda46e1fc61d42141b13e96d068f5abfd069ae81b131dfb5a66c SHA512 28166a1a1aeff0c65f36263c0009e82cda81fc8f4efe3d11fabd0312d199a4f935476cf7074fbce68787d2fec0fd42f00fef383bf856a5767ce9d0ca6bbc8ef0
 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
@@ -47,5 +49,5 @@ DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e
 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
+EBUILD openssh-8.3_p1-r2.ebuild 17104 BLAKE2B c1203cc284fc9fbc6bdf58e14fce7e88bc6407f8ca5dfd7fc5fd6ae6fd7e702f9fdb9dd83cfae9184921488d0c38ad359b862ce7f3eaf8b41eddc4d944d4ddec SHA512 ac48088bc33f837860f8d3fa34875d72270ad58eed0f650288983307f9752aa0b0a47b5c244624f395e541867fba3b0552327f5d81a554fa92d240d888e903ec
 MISC metadata.xml 2009 BLAKE2B de9bc08ceda797610a3910f79fc382a40c3129fec66b65675e008c649f8dd7341ef12b4391136e0e0d036699ed98fe23d7b3def941cb26cd299a17408e469830 SHA512 b72696b307f01cfe3b4ccf746450fbd15d0e64436fe7668c936c1f902522df68218314d494254d8e5403dcb1ffc79a52e64212b6c49b0e464754875112048544
diff --git a/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch
new file mode 100644
index 000000000000..d1651bc187f1
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.3_p1-X509-glue-12.5.1.patch
@@ -0,0 +1,35 @@
+Only in b: .openssh-8.3p1+x509-12.5.1.diff.un~
+diff -u a/openssh-8.3p1+x509-12.5.1.diff b/openssh-8.3p1+x509-12.5.1.diff
+--- a/openssh-8.3p1+x509-12.5.1.diff	2020-06-08 10:13:08.937543708 -0700
++++ b/openssh-8.3p1+x509-12.5.1.diff	2020-06-08 10:16:33.417271984 -0700
+@@ -35541,12 +35541,11 @@
+  
+  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+-@@ -382,6 +363,8 @@
++@@ -382,6 +363,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -97028,16 +97027,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	     __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-8.3p1/version.h openssh-8.3p1+x509-12.5.1/version.h
+---- openssh-8.3p1/version.h	2020-05-27 03:38:00.000000000 +0300
+-+++ openssh-8.3p1+x509-12.5.1/version.h	2020-06-07 11:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.3"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.3p1/version.m4 openssh-8.3p1+x509-12.5.1/version.m4
+ --- openssh-8.3p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.3p1+x509-12.5.1/version.m4	2020-06-07 11:07:00.000000000 +0300
diff --git a/net-misc/openssh/openssh-8.3_p1.ebuild b/net-misc/openssh/openssh-8.3_p1-r2.ebuild
index 8238b501a1ae..80dc7c3cd59f 100644
--- a/net-misc/openssh/openssh-8.3_p1.ebuild
+++ b/net-misc/openssh/openssh-8.3_p1-r2.ebuild
@@ -21,7 +21,7 @@ HPN_PATCHES=(
 )
 
 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"
+X509_VER="12.5.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -147,7 +147,6 @@ src_prepare() {
 		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]"
@@ -190,7 +189,8 @@ src_prepare() {
 		#	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
+
+			eapply "${FILESDIR}"/${PN}-8.2_p1-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
@@ -305,7 +305,7 @@ src_configure() {
 		$(use_with pam)
 		$(use_with pie)
 		$(use_with selinux)
-		$(use_with security-key security-key-builtin)
+		$(usex X509 '' "$(use_with security-key security-key-builtin)")
 		$(use_with ssl openssl)
 		$(use_with ssl md5-passwords)
 		$(use_with ssl ssl-engine)
diff --git a/net-misc/ps3mediaserver/Manifest b/net-misc/ps3mediaserver/Manifest
index 0fc0239fc5b1..58a203313446 100644
--- a/net-misc/ps3mediaserver/Manifest
+++ b/net-misc/ps3mediaserver/Manifest
@@ -2,4 +2,4 @@ AUX ps3mediaserver.confd 169 BLAKE2B 9406c426b73e7d4cb349146f2dd975bcdd8de177615
 AUX ps3mediaserver.initd 399 BLAKE2B e45d66c845f47f54217a995bfad68fe5a3bddea5b16a009f94fe610bc26f292450f554fe822fa238e95b57add60f30397328e6d5460c3b983e49e06499c7726f SHA512 bd260d16f7d4b29d922ede6531d774031f548889fdd9156dd025ec7135824362dc4026cc9577ce85733a00b3eed70a8ce96fb894ccfeb81355b818013de12406
 DIST pms-1.90.1-generic-linux-unix.tar.gz 15789602 BLAKE2B 6240c4c4e21fdc0a587e26499969a0dd597ffa8a079812ef944268cc13d2437749f95d6671367baba04f52e2c7499b841e6cf845b3f8c708b756295a66ae9f76 SHA512 af5748989dff1b106ba44a952fc68b43d11a929dec56440cf11ffd6f0a0c561febce54557855bf1afc2614cfb904b5997265f0bdf4ecf45535e12bbabc0fd11f
 EBUILD ps3mediaserver-1.90.1.ebuild 2060 BLAKE2B 93d08be0c5e0b20a9ae18b782d74571f34c4b18efb1d677d79390db3ba70c33f9a2e34013f05dab75f65be06a8ad640e96996b24a4376097dd8a73479b002c81 SHA512 8879d3781dda5a43c6a9d7039d8d0565f5844a97f9d291baf3fb75d8a0b0c1125bdd487ad47c2b99c9106c2a04e2d465296b873945cfff826fc35bef017ec60f
-MISC metadata.xml 762 BLAKE2B 3c61906d1616ed061b8896a00a5d3cda7a501f3396bcde751bae3b9de2e40c8fc083ea1975d58ba207241a38900b53481e4ebcb2d5681fadd5d6ce3b7180fbd8 SHA512 1dfb89a3745ffb230a18cc48c17203c3d847c2a4f787180d0d632389ff7e098efc0330adb64ed85f4fdf85855dbeff0133c2a1238022ca1f7b13ad58d06d10bf
+MISC metadata.xml 683 BLAKE2B eb0d168e6d9c9ec4090f8efdd98c5edaf0888e63bc31b6aab98c306d87e9e65a93175ac0e7e2b9198d8e7d53f63c3181e8d044273cc0b6ca18bc7758e12ba366 SHA512 0ac0f8a5a30436a0597b97eaee727419e6c981b7dd5edc6f5ff98178c7b025a08ad57a5884834c42fcac54445e35425d7177ce4ac9c66a2e631ad1f6637889fd
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index d6c0593b67a0..4d85f3e3c2a8 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="multiuser">Allow renderer customization per-user.</flag>
 		<flag name="transcode">Install optional dependencies for transcoding support via media-video/mplayer</flag>
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 0b7291efa185..bdebd2500a17 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,8 @@
 AUX kernel56.patch 1863 BLAKE2B 8525effb79f50ca818797cb48f3eb225f5e50f7fe156186643c9639c7e30a5f03716b257c357e1f7b090792594025ba0525763a93b481a992822a8cc251c4332 SHA512 e50734adbd76627bccb4f0f08d6d1a3042a72fc7a836aac049c897ce9d7f37c41a0d0f7da1fc158d1ae8c14329ff2967687420bae0c72f7ebf9845f795d24aba
 DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a
 DIST r8168-8.048.02.tar.bz2 109232 BLAKE2B 24c04cd0e47fce427ef7de1a2e41e384fd7c0d8dd028715411cc6f47901b703c824dd9c15bc0ed90f649520bd5fd25dbd48cdc37f94ca8f838a07faa99c8aa84 SHA512 d9d828e4717d2857bd38e8c9b9005de19387419db9bc8d174f5c8a8ea120c81c3094770b164a1f92cec7833696d7a1302332ef473c5852146fff5dbf9a69196e
+DIST r8168-8.048.03.tar.bz2 109351 BLAKE2B f31ef24d42af737a97986f0e46bc6c737c43e8ccfe9fac8386eb9957a5d81620faa62602e1bec15840792785444b1d1bf8bafa2e5878c21f1962c7141d9bb32e SHA512 8da615a96cca413ca172e260c52c9f77a782e4feb466e4a4296ae11d895e9cc56bde0ed8634cc3a7a531a292072b68d19dcbe74d20ad9549266d3ee8e082096f
 EBUILD r8168-8.048.00.ebuild 923 BLAKE2B b91f9d551f38d5fb82e480e0ebd299de9dcbb9671897c1c17d3a682ea6c70b79c7e26b41b7daa092c76a2d53c2d819e029afb0ab7de32e0128110a24525c4c25 SHA512 d0972fb69d9c97d5e5cb845d7dd124d8c48ba789e157575298a750656976c06655b3ace2d858d45f457adbca6d20e085f89092d4491aa49996f7d18a7cf30a76
 EBUILD r8168-8.048.02.ebuild 966 BLAKE2B 5de1e783e73c113f06735475035d7cb61918ef6a0522a970d9c3f01d48ce9e6519d136cf9f1ce7a13543a3f73eb82905008f5497323c82bd6b80317754a9688c SHA512 d092a193b6ee1faed1ed99d21e8a268717078c47700a8033e29241259b303a6f3441aecf03b56727569779c4a3f71528545aa01dc99746164090cb757bc7362d
+EBUILD r8168-8.048.03.ebuild 924 BLAKE2B 2f18641ad6a6ed40af5ba470ae9fc57ad3b355d6d8b161a3f596977bef5810727a6c61d396e718537e8c6ce7cddb260740c3dbb5393ce6a242db3f4e6b34b873 SHA512 6a76911bdd8b6c95135da603b8af42914819a3a6e3c9034ed6e2d052d2bb202e4ed832bd2822a153a45ae1258ff5927ec80aa937742ddbe372fe8029416f22a4
 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/r8168-8.048.03.ebuild b/net-misc/r8168/r8168-8.048.03.ebuild
new file mode 100644
index 000000000000..54bd8991ee45
--- /dev/null
+++ b/net-misc/r8168/r8168-8.048.03.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="!R8169"
+ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index b0dce9a932e4..256ed2b847d0 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,6 @@
 DIST rclone-1.50.0.tar.gz 18566931 BLAKE2B cfaf983ae972606b8ccc56ba505aec65bd7e6427f0b16f7e6187b079116b47eb3d297a99b505782c2bb5b64a5c8bf4e5b7beaee9dad5718ec952033ceca0945c SHA512 df805dc711ecf60b869ec957d224676643bcb6eac756470d2194338b9cc34e2a657d286d4a4308c743847fc11aa821b106888eb6ab9f04677bc70747c73fc5c1
 DIST rclone-1.51.0.tar.gz 18835242 BLAKE2B 5798a844c893e111e73ae409adcb06fd4291df3c0319bf983f2336ada45a60df253e750397bead55278cbb497c541a63498f695ce03af7b6cc1056f022ad2748 SHA512 b0881e09b75093abe4d31e95425a90513aed4a16d9e2dbf79023c9dc68875b90a1332204879530c450a16ab9cac475d967f7657d6f810a1e0f0d84b88d7de916
 EBUILD rclone-1.50.0.ebuild 859 BLAKE2B c84444316be2f96809efb9e2ed04eb00e6a83f99f2b41982b96f3cfb9e268fcfd6b5f9a4c615247f026a922644365291b92d9b0327a9814e9a7258f22786b564 SHA512 0bdf451731b68b2a2be681fef6cfdbd58846939fb843310c0a3b59cb402b6cc96075395c1b5ccfb8e4dc3d088b449fcb7f538bed779ba97aa9298db52ba7cdcb
-EBUILD rclone-1.51.0.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
+EBUILD rclone-1.51.0.ebuild 866 BLAKE2B 9e062c50dafd247b9897b976affcf53639c99901e1308b78e23729c3507fad40777d26b45821f4c12fc2b0fe9d0d417874e96678929400a823a610b596026ece SHA512 39e3ed50f22e11abc7c758a27c1d55d470b7909d25725a03b7e9a2757046daee49bab413b20472cf9b0f1703a494740cc960a16688fa25bef282cda16b068e35
 EBUILD rclone-9999.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.51.0.ebuild b/net-misc/rclone/rclone-1.51.0.ebuild
index d8704bb08407..380576cdebc5 100644
--- a/net-misc/rclone/rclone-1.51.0.ebuild
+++ b/net-misc/rclone/rclone-1.51.0.ebuild
@@ -9,7 +9,7 @@ EGO_PN="github.com/rclone/${PN}"
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 2d2f7a73f479..5a7e8e0579a4 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,10 +1,7 @@
-AUX remmina-gcc10.patch 911 BLAKE2B 4499abeb5b85d1460c4f00596222ad6dafa1bcf4434c2b6cfa3bbd7f0935cfa2a83e17fd42352437c9f82bf6598c36cd435992253101343599d37911557bb6f0 SHA512 4a54f0c98de0c9f24a11ac6cf935fadc7e832bb6a6bf4ff5b95ab0eaf065dd8d54b39f83f7ba6da31f49ee597a33fa1e8ec3efbf019b806b446d99106efd562c
 DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
-DIST Remmina-v1.4.4.tar.gz 1786300 BLAKE2B b4e13a34319c74f1fc935b1b72307e1dbc74d868e23f6b626e4477ca1253e52c0ba70270862c8e6e8fbfc8f7591a27b9319c41b398d4e1cf01339eb778a677b3 SHA512 2264a2d0f6ba65fbb46a2a8cc0a5c2ccd2f562e737b03cc393e7bed811d6437e76792ce3ec5013b48c9b068a58cf92081a49d05bd9be6781960e8db7e4569e35
 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
+DIST Remmina-v1.4.6.tar.gz 1895441 BLAKE2B 38dbda1976f3af3ad89c84eaecf50c42a2a22186dd013d30ae0cea83f5ee54af1443c196b79c1b4684e6afbc6f3d8fc8461fae18806476b8ae1a79148a2ccb12 SHA512 8b918502622957f6a1637d5d79ec605f7bf1c164f902c76a3a65dc316a8ccd11de63066182ffad4783bcb7f86d5e04ca6462f6a5d2e4256c4ae14c6f483419ea
 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
+EBUILD remmina-1.4.6.ebuild 2519 BLAKE2B 0cb9245e01e3e36d022a76089cfb57d4f50681585b01e1a54f22d32c34a8b26f39721d882ee2628a442f915684ec0fbd0441caeafe34dc962535181f058b6ce8 SHA512 77134ae29285309a7e3d4e453475047d0c28110d849df984307bfff2ba00c4633e1a7cafc8593a065dd15d18c39d31ab62ece614a48f535001d7d40f66bc67c4
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/files/remmina-gcc10.patch b/net-misc/remmina/files/remmina-gcc10.patch
deleted file mode 100644
index 214a8c887879..000000000000
--- a/net-misc/remmina/files/remmina-gcc10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 27f84d1c0a2e4c2432281f25ef3026bb00bbdc15 Mon Sep 17 00:00:00 2001
-From: Antenore Gatta <antenore@simbiosi.org>
-Date: Sun, 9 Feb 2020 02:34:50 +0100
-Subject: [PATCH] Removing struct declaration utsname as not used - Closes
- #2080
-
----
- src/remmina_stats.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/remmina_stats.c b/src/remmina_stats.c
-index a6eb6f609..3b7cbf0bf 100644
---- a/src/remmina_stats.c
-+++ b/src/remmina_stats.c
-@@ -159,8 +159,6 @@
- #endif
- #include "remmina_stats.h"
- 
--struct utsname u;
--
- struct ProfilesData {
- 	GHashTable *proto_count;
- 	GHashTable *proto_date;
-@@ -864,9 +862,6 @@ JsonNode *remmina_stats_get_all()
- 	json_builder_set_member_name(b, "REMMINAVERSION");
- 	json_builder_add_value(b, n);
- 
--	if (uname(&u) == -1)
--		g_print("uname:");
--
- 	n = remmina_stats_get_os_info();
- 	json_builder_set_member_name(b, "SYSTEM");
- 	json_builder_add_value(b, n);
--- 
-2.24.1
-
diff --git a/net-misc/remmina/remmina-1.4.4-r1.ebuild b/net-misc/remmina/remmina-1.4.4-r1.ebuild
deleted file mode 100644
index 1d0d44c06ec1..000000000000
--- a/net-misc/remmina/remmina-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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_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.4.ebuild b/net-misc/remmina/remmina-1.4.4.ebuild
deleted file mode 100644
index 7489ced509f8..000000000000
--- a/net-misc/remmina/remmina-1.4.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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.4-r2.ebuild b/net-misc/remmina/remmina-1.4.6.ebuild
index 485866aee596..f429622f2dc7 100644
--- a/net-misc/remmina/remmina-1.4.4-r2.ebuild
+++ b/net-misc/remmina/remmina-1.4.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -80,6 +80,7 @@ src_configure() {
 		-DWITH_LIBVNCSERVER=$(usex vnc)
 		-DWITH_WWW=$(usex webkit)
 		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_NEWS=$(usex telemetry)
 		-DWITH_ICON_CACHE=OFF
 		-DWITH_UPDATE_DESKTOP_DB=OFF
 	)
diff --git a/net-misc/ris-linux/Manifest b/net-misc/ris-linux/Manifest
index 0e8bd08b7544..f3fa47e53c62 100644
--- a/net-misc/ris-linux/Manifest
+++ b/net-misc/ris-linux/Manifest
@@ -2,5 +2,5 @@ AUX binlsrv.confd 90 BLAKE2B c4cf8149e8fa970f76682701e1aa8248292cfc95f0094537381
 AUX binlsrv.initd 775 BLAKE2B 9bf7fd79566a35ca4ea4836b6b0733ae76322b7780f4346ab74d10e5114c42baf963634d9cf819d0f14f1a0473789f565387c522b3ccc716c7bceec3f9e8ec89 SHA512 2555500d462907daa6c6027b30fb67a32d453dd611ee5a9e71e5ed8cdd2943dbb5ebc0c1ce7de7ce70f0c1158afe475a56156da4ca611c8bd30ea5b95d546419
 AUX setup.py 204 BLAKE2B 82bf28846611f2d4e24b62ccc945359055ee20ce492703da6fd9452fa4475cba507ccf47feef81f6a099afb125466cafbd1ec06bfffdcc39a6f45175a56f4f5e SHA512 a2e3482ae7d4cec63230d0e787c6ff6af8fc749d84aa74de51152bc5f8aa5f9d29b6578a82141fdbc15c61786d7e8a9cfdd14b885d5ed2b62f30033548a4f240
 DIST ris-linux-0.4.tar.gz 21634 BLAKE2B 815b54eec6ff29f06f5d1be0e8eb597c6118ecf7698d6d99e2b887ea8b1919d861feb445f2bf9f58c28c0cbb3304b168f9d3937331e65511023ac6281b4ea309 SHA512 e9eea14b45c060844e22dc3baa9cd15e7d202bcb3cb8b069b084115b05c0700bd563ed6322d675eee9baf72e8d530429d0c3137386377b6785ebc9007dbfd040
-EBUILD ris-linux-0.4-r1.ebuild 788 BLAKE2B 02396d5ea2a9fc31753e91e6b9824a0c786dcedd90cc0b5aaa64403d6d3e4db73d48e9e7bc42f93e0d63096a83524c32852ade5a2467c5e55aa08252c32703e3 SHA512 88e0b2928374fbcbee46c84819baa4cecf1d2768d82a44cfee7e5e75b1d8333e644780ccb2a760beb77f688a2d749119c3df1b57d798cc0dbb1a8b5c8f7d1a60
+EBUILD ris-linux-0.4-r1.ebuild 790 BLAKE2B d15a9513ce381f0f70311db403bf50fead7d0cdb4984c9b791397b3a3c33032923757436641d385cb19cd2d22b99a2e7b3dab6d7f1cb8ee27b51a79e7830228a SHA512 000f2f82c62a4a7bdd7909abc5b5a9d1209973a6a5be6ed5449d597bcb6544ebf2154e9c4c089a6b3d9eee978f215cf8110963a6e6c94c2e921571674b706f85
 MISC metadata.xml 217 BLAKE2B 19c9d1fa32b1387c2578d4acf482cfddbc144decd961796c2dabfe02ad2b11e232eee8fc02c900f176f7cbba0ecc741c66b1a55d3734b2901c40a98194a78433 SHA512 892fa1b0f9fef66cd02147277c70b886bfef9d36817e024d35216a14bd1a2bd640ffb8d6f57bed87cd06b7c4cce17eb3c8fe4255cdc62972b551c73509c0dfe7
diff --git a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
index 850ea2126102..282889fbed0b 100644
--- a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
+++ b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
@@ -9,8 +9,8 @@ DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1
 
 DESCRIPTION="BINL server to doing Windows(r) RIS"
-HOMEPAGE="http://oss.netfarm.it/guides/pxe.php"
-SRC_URI="http://oss.netfarm.it/guides/${P}.tar.gz"
+HOMEPAGE="https://oss.netfarm.it/guides/pxe.php"
+SRC_URI="https://oss.netfarm.it/guides/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index e951dba1a681..213e7ce8b369 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -11,5 +11,5 @@ EBUILD socat-1.7.3.2.ebuild 1520 BLAKE2B 32d8aa672a3a43f6024feb331edf40eabca1264
 EBUILD socat-1.7.3.3.ebuild 1471 BLAKE2B 687c3406bbdf64c937d3c9ac3c390d0ecbd03b88c7fd09f32ec7e7225e24f6758aa5379c538c465e400e55e178c361661568c70c273ce7bc230b1ef35a992401 SHA512 1e41fd0d07fd686f5a7aeda87a998dd7fa83d254ced0bea3b27267fbe2e70fc9d88efe0864c8ef9398ace0f301842f7bc13199535a13be4b608cff8b7a7c84e4
 EBUILD socat-1.7.3.4.ebuild 1477 BLAKE2B ed640d382b632be7e1410061a8b38266500761009b17143a28acdee817b83d68bee5288e2f969cad4e0946f93e4af545ac70f604362b14f7f37977b872580ef8 SHA512 1fef52abadf4ba97fc77764616e5ab1111f8621665dd8f9a137075de2d9f8e8db48aa0d633c3bb925d58f6cc5a1374bc755236eb1a35f64bddc0dee55eba2da4
 EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18
-EBUILD socat-9999.ebuild 1383 BLAKE2B 03bc6cab87aa5f55110b3d2421961b81d02389eedbcb1dcc6f942ef1fdc5171204da8caca26e9e388008dd33f702378d7be00abcacaa37c1e28211e19fddc6df SHA512 308a2f4dda32700072c3812e4226f1e3d356b015c6988aba0d220cac0d6c9cbcfeba2d49a5c55c9149eb068493bd5b31e5eafd34ba036a9b901002e29a8c969a
+EBUILD socat-9999.ebuild 1395 BLAKE2B 0884f6b4f865dc2ff255e5a48a45c0de198b3b926db598d18472758767c6a7e10978a59a88b7ec543bd1f5b8b4a18aa67b42bf59cbd3ecaf2696e83932940b53 SHA512 8836b32f18f8680bf27c26c10ac996d14befcea2f1f2ba6aab2f5e433e757ec51e81a0bebfced410c7e07f3cbd9704af7f349441530e223d132ccb5c78a3cc20
 MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index 2c12dbc3dc4f..7d28699e42fd 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -21,9 +21,11 @@ DEPEND="
 	readline? ( sys-libs/readline:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
+BDEPEND="
+	app-text/yodl
+"
 DEPEND="
 	${RDEPEND}
-	app-text/yodl
 "
 RESTRICT="
 	test
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
index 7d1d153f2507..041356328566 100644
--- a/net-misc/spiped/Manifest
+++ b/net-misc/spiped/Manifest
@@ -1,5 +1,6 @@
+AUX spiped-1.6.0-ldflags-support.patch 1571 BLAKE2B aa2cdddc0035cf1afefc2e204cb9835d968794dd41212c805804c475ef04ab6b4dd43622865b3f7335a599e6a7fead41da5edb5c2e9744c16930df10742bb07f SHA512 4134e4bd04df2622a20a4881c1705e614fa5082b6b9c93424a3756ae184ca2d531cf1e471552cb5bff073ffef2128c1b0db9a7a429ddddf94ef1bb91ac29a3c1
 AUX spiped.confd 639 BLAKE2B f9def241056bee9ca46de9735fdf9083d3a196476934fe4486b2cb6f19aeef31e5551b112da7b47e511d2732231741865c043a10946c686a7b9aad8d4e1cab01 SHA512 ce2b2f4025ce69ec639e452ed4f4760600e2acd41c29b7ab9c75a7e72bc66cf29c60d417a19f08bd7f7f1cfc7d8582ad6de62738251be3964bcf16ca872887ac
 AUX spiped.initd 649 BLAKE2B 2d516af5fc78d7ae13ca79ae8fe24756f484f6b7892d9acaa0a2fb7a62425d66bd2f7172bcc6b396380542bfe496434e70d6a0b93c0c29d3b5e064b41d4bf655 SHA512 6acdf82ca2ed469e3b69813e59628d3148b7c3600b5af74a82d6c715d812b74ed1effd43d7e644d872f1faea4a553e365f36cf054c4727fdc902446f0b89f52a
 DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a
-EBUILD spiped-1.6.0-r1.ebuild 912 BLAKE2B 21edc507bb9ea1510e553ff189e9a679915d9d2d8391bb032bd8780f36928ffbfa80a3440f75b4c4a2b89e1afc6e4313f573747b28c869236692986cf6484c71 SHA512 f78d65f7360c4291c8c3cb7c8f3d19858c56de144ef5af9e5c75d27773ad1f514604e8b7dfa5c2ec3abc463a1dd0f28c2e16d98b211c8a3335db667b9c8b12bb
+EBUILD spiped-1.6.0-r1.ebuild 1070 BLAKE2B 61a0bc0f3b56a3e3f56d9287fe5f4022066d2e8459ac6c80f4fa18113a6b97d7fa10f6ef987a24b094cc9567d18e77f67ec1733d61935f27f35701456dbbf134 SHA512 52da723a5943b8e377d4c912c8ec1f40afe2cfed08207297e4885a49139bf2bd537ea9376424aac4d5fbf9c385b1114dc4ad8e4b1fea8c166d93fed8dcca616f
 MISC metadata.xml 698 BLAKE2B a87abcb8c6729e90053ae83af7f33e29e5f6e9a4bd3ef53f71554caeb2d2c5c1e49a60cd98cee89ba4984bc31c35496e3fb3d3392b35fdc5c0a8b086490b7937 SHA512 26f7bb3fc9a8fd2f2ecc9a6b249b777bc9761f2058f3aa01a700d745e17a8e1f6aba16a8b013576b6bbb4cad951e7a4e01975c22c1cec9217307723ecaebbb63
diff --git a/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch b/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch
new file mode 100644
index 000000000000..e7502d539c94
--- /dev/null
+++ b/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch
@@ -0,0 +1,22 @@
+--- a/spiped/Makefile	2020-06-11 10:21:27.592104792 -0000
++++ b/spiped/Makefile	2020-06-11 10:21:55.028522571 -0000
+@@ -27,7 +27,7 @@
+ 	rm -f ${PROG} ${SRCS:.c=.o}
+ 
+ ${PROG}:${SRCS:.c=.o}
+-	${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX}
++	${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS}
+ 
+ main.o: main.c ../libcperciva/util/asprintf.h ../libcperciva/util/daemonize.h ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../lib/util/graceful_shutdown.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h dispatch.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h
+ 	${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\"  -I.. ${IDIRS} -c main.c -o main.o
+--- a/spipe/Makefile	2020-06-11 10:21:19.025515816 -0000
++++ b/spipe/Makefile	2020-06-11 10:22:17.924981556 -0000
+@@ -27,7 +27,7 @@
+ 	rm -f ${PROG} ${SRCS:.c=.o}
+ 
+ ${PROG}:${SRCS:.c=.o}
+-	${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX}
++	${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS}
+ 
+ main.o: main.c ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h ../proto/proto_conn.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h pushbits.h
+ 	${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\"  -I.. ${IDIRS} -c main.c -o main.o
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
index b3ab508eb627..ca4826de3c19 100644
--- a/net-misc/spiped/spiped-1.6.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="secure pipe daemon"
 HOMEPAGE="http://www.tarsnap.com/spiped.html"
 SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
@@ -23,6 +25,14 @@ RDEPEND="
 	${DEPEND}
 	!net-mail/qlogtools"
 
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags-support.patch"
+)
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
 	dobin "${MY_PN}/${MY_PN}"
 	dosbin "${PN}/${PN}"
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index e1ee521df654..b64afc75af05 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
-EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 979 BLAKE2B a72347035985f24db73719a47f6fa0ddd82c582aa4a6d7f11f01072d312c11acef9ce515388ccaa68e2d9d92648fadca49834332c5efb6354afbb4ef946468f4 SHA512 97b4ab3684cc83d0b0850bc9adba6aa8176246ae87ae4f2e52d17e58f521c3aeda9f8b144e2407015a493172b8f2b9ff17d3d6fc4652325f3176d096ea6dc6ed
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 986 BLAKE2B d0c603ab3772dd84b4028fb2ee47c9d54f531a949c0a02bac57022cfccb9c1350af54726e95d900174c70be1e0d3a55efa8b43f739bbd64f7e22abb32685ede3 SHA512 4043a93f84ce6a417deee3aa334e507dce78c99ba9008ef8afe13552f6dd747a2942430adbe5265256d71a79fc393b842da0be9ac64df9b1489c1bbc13474236
 MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
index 382f83d18b00..466a49327b92 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/ssh
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 0586ee7a0d56..9177aeb52bed 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -4,5 +4,5 @@ DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b1
 DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d
 EBUILD x2goclient-4.1.2.1-r1.ebuild 1457 BLAKE2B 7d246b2e56ff6d84ddca5d1376d9c95399ebd96ac182b0f4b5969d5006a817f872d3984baf30b595bcf59a11509e330e7d4eb850ff9cc27de75352813d625ee9 SHA512 d31d2a343c5cdd006bf76102f8a9bdd9ed080f13c86ec90807024fe4216155966875d787e0df06b22b3e70db4e0c342fecebbde5c81704ae557c7dc6d0d501d0
 EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94
-EBUILD x2goclient-4.1.2.2.ebuild 1277 BLAKE2B 4f24790b33a649d5d153cdf012ebe37ba82b39238161e29881822fb3e133c35a29569879b7828bdce209e5155683091da0a5bf7bdb6b12268fc488dae9a14716 SHA512 5983bb5a824f0968a3151ac430b9b5b2512b3784a0432c4599cea1f9eaecd4c0cf30f42726d960652d4ba2c727ed989e892e64a8ce7ebf35746bcc9788332a7a
+EBUILD x2goclient-4.1.2.2.ebuild 1275 BLAKE2B 9cf9d6d7ccc697c6a52ab63ab2f519ed7ec2c2b2f3fcd8e54f9855fab786535b821dc17958a42a74a3a7d897e47e53c316336da136dc571916da64f05644b568 SHA512 1e537a1e4205b5ecf1af941758cf1b93bf45a7b9f7187e875515b7bf51d039c6b274bd4dc1b81f786aef462596dc8283d46c2350b7884b771fd529465e7fe6a1
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
index 6e14630de53d..313291619a0b 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ldap"
 
 COMMON_DEPEND="dev-qt/qtcore:5
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 5e7584339d2f..a4f456214a08 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-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
+DIST youtube-dl-2020.06.06.tar.gz 3176995 BLAKE2B 0971a8f82eedf3dc6a635b90318586988ffc8a8219386e0eda8ca020fb9981ceabb4b708c0d90c38f5eab2c17daa98d73cead473e33a1ed27b726a087d9a57f7 SHA512 b3c910f8b26a11e225cfdebc3612e04010e1af027bc48b88f0b8bd36ba83f10eaed05375cbc833b421da9b377152722aa74ab936ed238957165a6b5f0149589b
+EBUILD youtube-dl-2020.06.06.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
 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
deleted file mode 100644
index 27edc068096a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2020.05.29.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2020.05.08.ebuild b/net-misc/youtube-dl/youtube-dl-2020.06.06.ebuild
index 9dc88dfb1591..9dc88dfb1591 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.05.08.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.06.06.ebuild
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index fa63267f3d04..2fd10e69b2f9 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,4 +1,4 @@
 DIST youtube-viewer-3.7.4.tar.gz 281921 BLAKE2B dac2cbf76f3d0939f79fa875652680e197f41bf09769585894147dfe433db72a94d59309237f5ce5398753a39e2cf2cf83ae3f4f6987f5a4b49d806de2598e2c SHA512 4584821fb0ae3ec7e5f9c3b2e887b1fa158fb74a82be07698277e12d3762fd3b8f0557baddb9e08fe485f322b44b91adc2feaaba46227e0c519a516b54bbc4e8
 EBUILD youtube-viewer-3.7.4-r1.ebuild 2494 BLAKE2B 1b7030d1fc25858894e64641bdfcd3ed02da1d0a8c8d8beafcb88f6c492bafbebea3a12ce18c8e20d717a17f66de810176a0d4e661404e1062578163cd64cea1 SHA512 3105240f876af667f32e71022499e490d3d738547fae0f59fa544c026106fa2b9145e740348603349033f759af98e8a71a64031f745adf4a4560b4bb40a81713
 EBUILD youtube-viewer-9999.ebuild 2363 BLAKE2B 00362cde6040f2920a56ebb920714da4e28b5ef1425ffc4b5bf8eb920bed98d46822c22e5e1ef37ed37d8cf83fb5b333d6adca9cd7d0a51368697523d56a477b SHA512 47ae6a92016a1d61780fcb5c6f6b638f9ba19ad26ac5939e940e6fa3d8fd0ec3a23ae13ff28c9d2b3f02748e063072a8f8053cd65fbbe2ae6f6050cb201663d5
-MISC metadata.xml 1231 BLAKE2B 691c72ae1d2c9a73fbdbd449718ae6f14ce65ef95b997923c2a14cca565c5f2e7f85094ef4a68806615239f7ac16b08bc24ecc857e1f05f86d0d7f3920e67e0f SHA512 65289c8a1802c76de4d360682bba3b8ecd6c541797bcb33d18f237aaaf86a1d715749fd7b2d668a108803fb9e33ad49e5a7691ea0e3a4f081a6b99a7cab32e4e
+MISC metadata.xml 847 BLAKE2B 212670f9fc51ecba97d723572602f0e38021712746db20248e084549c0d574388bcf94139a1bed4cd2255dace6fdfd2e2dd31103ef88144b4bd6b9f740085bd9 SHA512 84ca1c094706ebbf570e9eed2d8142f80b0eea012eeda6f972ab99bd17c802babee5a5a5109ddbfe2837e0c6faacf30dfdd4d54d95e23099966f83f485d1893d
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 8b79660b6222..a2c38d57a739 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>zoltan@sinustrom.info</email>
-		<name>Zoltan Puskas</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>trizenx@gmail.com</email>
@@ -18,9 +11,8 @@
 		<remote-id type="github">trizen/youtube-viewer</remote-id>
 	</upstream>
 	<use>
-		<flag name="gtk" restrict='&lt;net-misc/youtube-viewer-3.7.0'>Install the gtk2 GUI</flag>
-		<flag name="gtk" restrict='&gt;=net-misc/youtube-viewer-3.7.0'>Install the gtk3 GUI</flag>
-		<flag name="gtk2" restrict='&gt;=net-misc/youtube-viewer-3.7.0'>Use the old gtk2 GUI instead of the gtk3 one</flag>
+		<flag name="gtk">Install the gtk3 GUI</flag>
+		<flag name="gtk2">Use the old gtk2 GUI instead of the gtk3 one</flag>
 	</use>
 	<longdescription lang="en">
 		Youtube Viewer is a CLI application dedicated for searching and
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /net-misc
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)