gentoo resync : 25.11.2020

272 files changed, 4585 insertions, 4178 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 88cc4f4fa8e0..d3be71d9b6dc 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index fd20b14824d2..d13ac52d20fd 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -5,6 +5,9 @@ DIST anydesk-5.5.6-amd64.tar.gz 5054062 BLAKE2B a131fe5e10def7017cf29e8cc175e2b4
 DIST anydesk-5.5.6-i386.tar.gz 4970197 BLAKE2B b656071498784052ce1c81f32c0ae333039930b26487d204dc5f55e8352f263878437ab3a4e2ac8469745ece75a29056f553f12f33fe96c9c2bc54d3d4644941 SHA512 3b561e014cc4c149f4d77b43c4e5427266604679dfdf9253bb76689ee6c6ac5b274cc5ac58147bdc136c20f616c9f9d8dbc2c11b5b85d0f184a0251ece2ad265
 DIST anydesk-6.0.0-amd64.tar.gz 5195378 BLAKE2B b967e063cff609ff9a93f3946c6f555987526d2fd163130dc74d0e69d720972a483e0b7df04b1e39c9096156a7161ab46b160b243e249fca4ce7c6c565ae104e SHA512 f41e1fd7dc505166a21b0b7a16ad295e75b55ba73646564c8f1531f3ea659f58868294e694479a518f8692f1eb14918fa6a62c7b1e115f81da478bf8d268e07c
 DIST anydesk-6.0.0-i386.tar.gz 5116771 BLAKE2B 074907ac1976a3b9df7df0acf29663039e0b56466c417cb40b6c2d5d643fa4f207af529ee89a278f26ede330e8bc6fc3b32e9e5a451811ff2d8e6e1b2ccd9065 SHA512 09bc0b0ae0f9d2ca764e9feee81c38a9890e710908265c35c181657a13eb5d326cde52d01b7ba68132aac1784b6422df33c904b130f025967e9375332a350414
+DIST anydesk-6.0.1-amd64.tar.gz 5209989 BLAKE2B 5588b40460af9033aca744440d5ce43db608b8dc188a33c6f317e5e36c32b5ee8b102761b2153365018dea3a3afad03b4b1a2720cafd98f62789de407deaaeeb SHA512 bdf585bdb6fe5738e253f631807965446f585a4ffed3747b2e147b3f39d474c3a9c6177c88e2cfa1c0ae0e46c0219f581171147393609f0ecd7fa4d6cccd369d
+DIST anydesk-6.0.1-i386.tar.gz 5130077 BLAKE2B 9d0467cb24493458efdac6d835b06ef22bb6db3aaeb7277386ae0749c215c3640e722e2e7d17964e32a668d63826a68f3429d3425fb7aabe59a2718648bd2b88 SHA512 58cf2ca8bb67f672ec2ac988216ab593479f09d32e8e6ace93b0d92640197f9d13a637480421be8b038f8840d91a89f97b937c9e3b3f115bc49a5fa852b2c064
 EBUILD anydesk-5.5.6-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e
 EBUILD anydesk-6.0.0-r1.ebuild 2669 BLAKE2B e180bd3ceeec590b6fb302f4ea99ca8abe3a87151cbb6c07a67c460e05f0fc553661b8570caaba52843c4370840655b25f8441c7f220e6264e3a3055350da4a7 SHA512 0ddeb37637e097570c3bc8a3dbbc5fd523ba4c5ee1fa389ddc50c2c834a605c22b86d0d67c259301e04148bee83134457e11c5c6de61f6ded680df53f8a6975e
+EBUILD anydesk-6.0.1.ebuild 2588 BLAKE2B c4a1c8fe8f9a3a146353bd21f5b3d4361ee27f1fcf26ccc71dd3dee31f8116ecbd91df5821baab064edd350d5758bd6bd4ab21776ff4546bda5a232aa6c845dc SHA512 af8e75d059d8f6c0c5bb5f2a2252d7d413afab9439982ae00b8998cd89700edb0078095b1369e4153353376926634a017689d2a5f8207831a3067968ea2aa862
 MISC metadata.xml 677 BLAKE2B f5b86851aaa83fc0f0a22739416e5d6fa06e4f8bdd14ed33660219774e1179a9df5e08440e99a3b75f156b72835a6a2c9742ba176828ac6caea9f7d564ebca87 SHA512 824b2ba8de1e03f3089a248226612505b2d0e172443fadc488a45d8f5a4eaa26e8acb8c67f27476dc0d7d8dd8de25950a87225f8495cd1b38c573308c3d1fc3c
diff --git a/net-misc/anydesk/anydesk-6.0.1.ebuild b/net-misc/anydesk/anydesk-6.0.1.ebuild
new file mode 100644
index 000000000000..6b1d45ed0538
--- /dev/null
+++ b/net-misc/anydesk/anydesk-6.0.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop eutils systemd xdg-utils
+
+DESCRIPTION="Feature rich multi-platform remote desktop application"
+HOMEPAGE="https://anydesk.com"
+SRC_URI="amd64? (
+		https://download.anydesk.com/linux/${P}-amd64.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz
+	)
+	x86? (
+		https://download.anydesk.com/linux/${P}-i386.tar.gz
+		https://download.anydesk.com/linux/generic-linux/${P}-i386.tar.gz
+	)"
+
+# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
+LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/glu
+	media-libs/mesa[X(+)]
+	sys-auth/polkit
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtkglext
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxkbfile
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/pango
+	x11-libs/pangox-compat
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_install() {
+	local dst="/opt/${PN}"
+
+	dodir ${dst}
+	exeinto ${dst}
+	doexe ${PN}
+
+	dodir /opt/bin
+	dosym ${dst}/${PN} /opt/bin/${PN}
+
+	newinitd "${FILESDIR}"/anydesk.init anydesk
+	systemd_newunit "${FILESDIR}"/anydesk-4.0.1.service anydesk.service
+
+	insinto /usr/share/polkit-1/actions
+	doins polkit-1/com.philandro.anydesk.policy
+
+	insinto /usr/share
+	doins -r icons
+
+	domenu "${FILESDIR}"/anydesk.desktop
+
+	keepdir /etc/${PN}
+
+	dodoc copyright README
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To run AnyDesk as background service use:"
+		elog
+		elog "OpenRC:"
+		elog "# rc-service anydesk start"
+		elog "# rc-update add anydesk default"
+		elog
+		elog "Systemd:"
+		elog "# systemctl start anydesk.service"
+		elog "# systemctl enable anydesk.service"
+		elog
+		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
+		elog "further information about the linux version of AnyDesk."
+		elog
+	fi
+
+	elog "For querying information about the host PC AnyDesk calls"
+	elog "the following commands. Feel free to install them, but it"
+	elog "should run without as well."
+	elog
+	optfeature "lsb_release" sys-apps/lsb-release
+	optfeature "lspci" sys-apps/pciutils
+	optfeature "lsusb" sys-apps/usbutils
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 6634b152654e..6bbaabb72816 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -9,4 +9,4 @@ DIST apt-cacher-ng_3.5-1.debian.tar.xz 49916 BLAKE2B c01c96e5cf46fa3b8c46145b349
 DIST apt-cacher-ng_3.5.orig.tar.xz 325260 BLAKE2B 1cf19bd575d4e3d320f73771b31e98977417713d57ceaaccb8b6c0eff7bd5e02c99a0c197ddbc09d14d8f6a70799525dedfe1fbacb00357f65f0c8c4d540bcab SHA512 0bbc78c128d353ec2504f4d898d0ffb339778e98ab9899d48c61c094b15cafd92e430f864c82b66049578f5dd3c9e74fc5c09883231faeddce453be64e6f8954
 EBUILD apt-cacher-ng-3.5_p1-r1.ebuild 2654 BLAKE2B 12fc9530aeced18d71bc4b4a23fd4b5315170d2b499e4354db49ec0e818694245eeed7db8fd36327093d0114dcba175793aebcaf8cb543526df22079166316db SHA512 2cb8a2292d56d00385c6e1566a511574316339e57c94d95aba3140fbf657b3c96275bea75b0c895a06438b9d6f34c75ebb79e6ff65b0b0ad115366aa89b71cb8
 EBUILD apt-cacher-ng-9999999.ebuild 2433 BLAKE2B c0c38e832d015dbefb62d4d661269567dc69e00247913e54155442b28b992d6b49d03489f97454390eecc11ee695eabf1817573c5f13e968a3c845707f729e38 SHA512 d58313380be4cdb7931b9ea5426996ce9b0380c13f474eaacde7aaa8ae448b7690bd41fc79feaf572f1902a69983d7c4fc000956fe05aaa7df8e291635724d36
-MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
+MISC metadata.xml 302 BLAKE2B 45d53591d095c3b57ddf3111fb9d214495a84d905b0428c7a9f45108354a82d0c7c84cd86e6e3b9afe5ab183ba49252da7ca6a6edde61558a73d5bb992b60eaf SHA512 f78c942870ae5a99f63f31535853047cc9c1fb5a2d84a8341558fa22c37e2cb07bb604b63a1952750dd0b895458b6b7b514974b0128cb27a33f4c3f69ba0e4fe
diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 88aef1304357..569b73d1178f 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/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="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<maintainer type="project">
-<email>deb-tools@gentoo.org</email>
-<name>Gentoo Debian Tools Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="fuse">Install the <pkg>sys-fs/fuse</pkg> based acngfs, to use a userspace filesystem for the apt cache.</flag>
 </use>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 5ccf026c2c9c..7ca1ff273ec8 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -5,19 +5,23 @@ AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
-AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec4428bdaa93e1354b660dfb76b5969b5811add3b092302dcba3fbbdfdcd849cacb1f05fe645af9d73d359 SHA512 556fe37a67994989642b609443d94f990b23fd0cf037268b1ef9f66a9fdd93a79cb7f2e9ee10c069936b41b7f361abbb72836b1da759e646733e2f7c14d3195b
+AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
 DIST asterisk-13.34.0.tar.gz 33686020 BLAKE2B 48de77f2e29028ab3503ea30038e629b6ede43154bec8efe1384a7077fb971f91b85d9b4eb55f7a4ea6577a31ad5fe496453fe59cd607a0c613e46edef9a11d9 SHA512 2132db831bb063330c47cea8cea67af706839d25e64eee558475643cb79a4e548fc6ffe7ce61a053f41cf6f367320eedaa87973a5de4ef38ae858a6e5a183ee7
 DIST asterisk-13.35.0.tar.gz 33685340 BLAKE2B 728281257541977ac150b1b7d6148fd326c584f7827af46882ff3e3af111d876c3e53f92f1034c55875d730e5b92c379b8906198393b7a4227a5bb74818ab27c SHA512 7596f387d45ef9f0327d78bc0446979e233aba517bbedfb539409cc507e2dac15e3b32d5c8a5e69783d106d4244661cb20b0580ed00904699bc5bf5db7b4713a
 DIST asterisk-13.36.0.tar.gz 33692378 BLAKE2B 7252e7a103d94bbdd4073563f88ec2952ef88856cb5a98f7a07818a993c1064ca4ffb12202f2c297125d7bc3fd3814c9921a87c179db03dede05162844bebbd1 SHA512 276175e6df1c8a2e642c4607aa32515e7c4fffe50f7db89bbfee8850b286579350a074bb8bbe743b3e95d6ce2d92f8d5444053fe52527071cc884356b57a1efc
+DIST asterisk-13.37.0.tar.gz 33696267 BLAKE2B 806e48fd2ed497becef87e5a349854e377aaaeb5f749e4c8ce957b585256edcc3c1812f199f793eecc829155baf12336f4971d2664e836ad38248139f5fc719f SHA512 f01ebc3a0b4d598f35f26e60aa6fdc03ab5d4ee28547ec048c2af9ab67f2657a5767484bf7d07d8fbcb1e84ce6865f4fe70772f30a5dc45568669ffeb7387b8e
 DIST asterisk-16.12.0.tar.gz 27727347 BLAKE2B 3e2e986136e5ff19a876f01fdc6db1b6c22f83bf38f8524a418e474e2400375d8091dd215fb54f5b01f998cecf46d6965a0c35a44dc6f3be7f7a811e2ce70b8c SHA512 1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891
 DIST asterisk-16.13.0.tar.gz 27735450 BLAKE2B 64cc75c7aa715734ebaf06fe7b3df54cfa309fc6126b45abfc21cc22c2c4e795946be473ce2887dc074124f9da6c8937d1bb4207fecf402eed7803ed063faa80 SHA512 872c5a5cb8faf9b1632895dafb6ee86c87e1766c9f33099b32216e6703f063800f87cac6db3537d1744349c42abd3ea83d70afe35138e45fb756872688822dfa
+DIST asterisk-16.14.0.tar.gz 27740877 BLAKE2B f8a09d39c36c1cdcc17878f1af69da7691503290177583ec1a92ac0471c029e527a3b62bd731a7340c43fb7abeca32b604303f0739e614c5a1edb0131f07e0fd SHA512 699b0c701a00df0ffcb7094f5cc732b645775deb85486e044685685b81aad09e6b2e9558436e80c505de93add630b76cf49d7261ba8eaae46f93272844346234
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
-EBUILD asterisk-11.25.3-r1.ebuild 9217 BLAKE2B eb0e7a050246a399a16460392602bc1e24b1c24ccdfa498eff96e4b385783d091422aa68260460ef11643084191b47f377841d8bb878558f7ac2fa31b4545dcf SHA512 5f53ad786fee2e7e14d144dce3f59ba11e39645469fe056b505b784f6f8eea1be274fd5eb9a63bbd66ae9c1c3e014b5cc2f7c38cc939884b9346e2aba5212432
+EBUILD asterisk-11.25.3-r1.ebuild 9180 BLAKE2B b07f75d272f64b8f33207c0b244607886370e5b341339807b3f1c8a4a51ef19b259c875deb5ce3e35c0631ec8de60d312a5b71a7fde05b96ff38c1cc649c1f2b SHA512 4ee25871b10b4d9aa8c21ecae7d6b2b87cc60710472a46c984cde8677230eb4cdf12990d3d128aaa6d84ff0f8cda82f4caf2aa10ca58797b6014386517518595
 EBUILD asterisk-13.34.0.ebuild 9114 BLAKE2B dff3812c7fdfce38e14426d4fcb04ac1829303be1ef1caac40ac98c1ecbe6fe5f3cef33847047f16a5af163e26c9a669a2960f2d145f80f1bfa13800e93b600c SHA512 b144e6b3820628dd2ae44c69e18056967cd96e8a7ed9cf397cbe31cf8587233cb82c9b3f4ffbaa2086cdfa1a1e5cb987f36f940be759ae424e5ac0455147ec5e
-EBUILD asterisk-13.35.0-r1.ebuild 9185 BLAKE2B 499a0edee30087662bd0d1206ff4c48096b32e36e847cc63218fcf6b579b0f405613681b401bc42024714eb8de488432da5902e2d7cad0e7f5b43f1b192cd817 SHA512 8db46328ef142fbdf522ff0b4a379d8bdd8122d9ac9b3c617ab3a61b7d00601293e30cdadcd99b7ec825c36c3abddca7feef444660f27b0b46863f9fcee31110
-EBUILD asterisk-13.36.0.ebuild 9185 BLAKE2B 499a0edee30087662bd0d1206ff4c48096b32e36e847cc63218fcf6b579b0f405613681b401bc42024714eb8de488432da5902e2d7cad0e7f5b43f1b192cd817 SHA512 8db46328ef142fbdf522ff0b4a379d8bdd8122d9ac9b3c617ab3a61b7d00601293e30cdadcd99b7ec825c36c3abddca7feef444660f27b0b46863f9fcee31110
+EBUILD asterisk-13.35.0.ebuild 9185 BLAKE2B 499a0edee30087662bd0d1206ff4c48096b32e36e847cc63218fcf6b579b0f405613681b401bc42024714eb8de488432da5902e2d7cad0e7f5b43f1b192cd817 SHA512 8db46328ef142fbdf522ff0b4a379d8bdd8122d9ac9b3c617ab3a61b7d00601293e30cdadcd99b7ec825c36c3abddca7feef444660f27b0b46863f9fcee31110
+EBUILD asterisk-13.36.0.ebuild 9183 BLAKE2B 6640b497021dfeda7443648344b50d71b5c98c881073e4eb5f88ff715e4b0ceb671096aa037a43629cdc09e6082f3ff6f7d871c07794acb9765a4eaf00ced6cc SHA512 1e6be35fcc57045582af7cf1cf4d00b3c2e52f791d3902367622602e84b34e4ef9dabab545e9a0ece8d294822af3a6ae160bc317118d3b176429a9c94e086c89
+EBUILD asterisk-13.37.0.ebuild 9185 BLAKE2B 499a0edee30087662bd0d1206ff4c48096b32e36e847cc63218fcf6b579b0f405613681b401bc42024714eb8de488432da5902e2d7cad0e7f5b43f1b192cd817 SHA512 8db46328ef142fbdf522ff0b4a379d8bdd8122d9ac9b3c617ab3a61b7d00601293e30cdadcd99b7ec825c36c3abddca7feef444660f27b0b46863f9fcee31110
 EBUILD asterisk-16.12.0-r1.ebuild 9362 BLAKE2B 21c376575631bae725a96adfed3ead1b4cd0503d053e802d8ebc6dae77742c04853bef6f66a7b81bca55f8b23505c950a381527b1daecaa6b8ef179942d7f6ea SHA512 8c458c9f2498387f2cdc91bf25d2176b24916e9da459509182a526c2a123077e76fb72f509680d72d19c8a93e151ec008e5a489f7518ebb607e345b157577221
 EBUILD asterisk-16.13.0.ebuild 9362 BLAKE2B 21c376575631bae725a96adfed3ead1b4cd0503d053e802d8ebc6dae77742c04853bef6f66a7b81bca55f8b23505c950a381527b1daecaa6b8ef179942d7f6ea SHA512 8c458c9f2498387f2cdc91bf25d2176b24916e9da459509182a526c2a123077e76fb72f509680d72d19c8a93e151ec008e5a489f7518ebb607e345b157577221
+EBUILD asterisk-16.14.0.ebuild 9362 BLAKE2B 21c376575631bae725a96adfed3ead1b4cd0503d053e802d8ebc6dae77742c04853bef6f66a7b81bca55f8b23505c950a381527b1daecaa6b8ef179942d7f6ea SHA512 8c458c9f2498387f2cdc91bf25d2176b24916e9da459509182a526c2a123077e76fb72f509680d72d19c8a93e151ec008e5a489f7518ebb607e345b157577221
 MISC metadata.xml 1301 BLAKE2B 0989c94d86393562384681c19a2809dc6ebedfcdd592543b606206a8bd7829a4ca6768cb74082f74e75635c72804dda9154df3a4d61dcdbcc43eda93aa881322 SHA512 009e4dba6f55b8ff08940aab4722df6b76a055add43c7634a49dbc0fb68fe11e6c102a7a27ac84a253a2853b0d719f3a73bb40c86c2d2faa186b707e773987e3
diff --git a/net-misc/asterisk/asterisk-11.25.3-r1.ebuild b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
index fa44fb9d427c..6d56de398ae6 100644
--- a/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3-r1.ebuild
@@ -72,8 +72,6 @@ CDEPEND="acct-user/asterisk
 	vorbis? ( media-libs/libvorbis )"
 
 DEPEND="${CDEPEND}
-	!net-libs/openh323
-	!net-libs/pjsip
 	voicemail_storage_imap? ( virtual/imap-c-client )
 	virtual/pkgconfig
 "
diff --git a/net-misc/asterisk/asterisk-13.35.0-r1.ebuild b/net-misc/asterisk/asterisk-13.35.0.ebuild
index b4c18883346d..b4c18883346d 100644
--- a/net-misc/asterisk/asterisk-13.35.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.35.0.ebuild
diff --git a/net-misc/asterisk/asterisk-13.36.0.ebuild b/net-misc/asterisk/asterisk-13.36.0.ebuild
index b4c18883346d..5ae8a5660949 100644
--- a/net-misc/asterisk/asterisk-13.36.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.36.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar
 	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-13.37.0.ebuild b/net-misc/asterisk/asterisk-13.37.0.ebuild
new file mode 100644
index 000000000000..b4c18883346d
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.37.0.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( net-libs/pjproject )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(usex "$1" enable disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISE_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			_menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	for conffile in "${ED}/etc/asterisk/"*
+	do
+		fowners root:root "${conffile#${ED}}"
+		fperms 0644 "${conffile#${ED}}"
+	done
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	if use doc; then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-16.14.0.ebuild b/net-misc/asterisk/asterisk-16.14.0.ebuild
new file mode 100644
index 000000000000..44f1f489f95c
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.14.0.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9 )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISY_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
+	for conffile in "${ED}/etc/asterisk/"*
+	do
+		fowners root:root "${conffile#${ED}}"
+		fperms 0644 "${conffile#${ED}}"
+	done
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	if use doc; then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+}
diff --git a/net-misc/asterisk/files/initd-13.32.0-r1 b/net-misc/asterisk/files/initd-13.32.0-r1
index 45c5f31398d5..2a7387dc2eb0 100644
--- a/net-misc/asterisk/files/initd-13.32.0-r1
+++ b/net-misc/asterisk/files/initd-13.32.0-r1
@@ -52,7 +52,7 @@ setup_svc_variables()
 	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
 	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
 	case "${ASTERISK_STOP_METHOD}" in
-		grasefully|when\ convenient|now)
+		gracefully|when\ convenient|now)
 			ast_stop_method="${ASTERISK_STOP_METHOD}"
 		;;
 	esac
diff --git a/net-misc/astmanproxy/Manifest b/net-misc/astmanproxy/Manifest
index 0693882b9e4e..12508c2624fa 100644
--- a/net-misc/astmanproxy/Manifest
+++ b/net-misc/astmanproxy/Manifest
@@ -1,5 +1,5 @@
 AUX astmanproxy-1.28.2-gentoo.diff 1130 BLAKE2B 5538bb8515b1d2fab2580ba91905b5db8e9a2675fdfa31289edd0a87a517bb29d5df9ef10640cffeb3f77383c00c4930b78d6a81aba8bf63680ac0487141322c SHA512 296d885478cc66868a7e77d5edaefe1779b5939e3ad26933c21a6e4f44744de00ff0d6d8302948b63f7b924b6cf90c9e790fc5d7d74fdc9df4a6ed3ab5a1b44a
 AUX astmanproxy.rc6 366 BLAKE2B ea8105b396342b1993c95851073dce4dcd0d7bb9d4538eddd36bd859ad8435de3bfed37c549f6bee7a86579951c55b00c95c611e178ce9a47550dd1d593e7adc SHA512 ad9f5a180ce5f2a63efd1a9f050d963ff2504c306e177562821ab80a62daad50d2a0077a4078094991d5fa85129708cf6970ad60adacf06989980fc46012559e
 DIST astmanproxy-1.28.2.tar.gz 65506 BLAKE2B b3aa3ca00f376d1030d96b4498880e55741a3e33bbd72b74e2ac52f9186c93bfb8f1c9d540ca51b122600e6ec519144184ef19e6e04f34a977a617b1c4c73052 SHA512 a37caaca42649b19d40b9b0cfe61c6a0e31d7d0de50378565a6add1b27ba09dd6044c7ac2d9b38c424f143fc12acbfa0931c59492399ee34db063ed73cce9293
-EBUILD astmanproxy-1.28.2.ebuild 970 BLAKE2B 63627b008838bea1ff1c17e462502273a631707ab3e21728325d3bc3d430c8d8565ea828ca1acbe25cab1360e2141a1bccc31bfa4aaf8ea8e8424bfcb1624b63 SHA512 807de3dc7fe08e4f3f4d44e123bedbfa4046c5b17f9740dfba5662dd1ab9dcaaad7b5fb63a43b291aae8e1e0dfd2b3b74e1ac5ee96f9dca536981c4762d3bfcb
+EBUILD astmanproxy-1.28.2.ebuild 981 BLAKE2B eb414be341aaf4bda4cfd5e612849199cd3e4d6e46089e04117549282b5a80dc5cab539ea17b48bf3178f93aeb9d01ccd9ee1cfea66a5cea8ddb14b8bf22a06f SHA512 985eba0d02da590cbe2a87c73b13f3abef7bceb108dad1a66a0fbca0282a132939300396f22feb80c3642c9eddb0f7de0e8d0ea6a7c58c46a38458a795d735f6
 MISC metadata.xml 305 BLAKE2B 4899629a0c66f4bfe08da5a38cac88a4d18f125facfd7ae70a7cf5e0d35250466545b7c1fe17c17355f78f502b361e9bc10e5290307d349354146c27f327216f SHA512 857608df82b978c77856f5d779f1a2e7756ba7b9d7d37a57c2c5b2618e5d99d6b648cf485b51ec3782d056c83a206e32c9b6e25ecb011b7a948ee056c50b2a76
diff --git a/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild b/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
index 73e1c6b42e1f..2fb64067a9ab 100644
--- a/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
+++ b/net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit base multilib toolchain-funcs
+
+inherit base flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Proxy for the Asterisk manager interface"
 HOMEPAGE="https://github.com/davies147/astmanproxy/"
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 3240b704e289..c68f213dc96a 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,5 +1,7 @@
+DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
 DIST axel-2.17.8.tar.xz 201224 BLAKE2B 0a10187013aa888ae8fa7f165b88955f5a7d63241157f552778c042eaecc7873e10e27537a8c7a26a09df5e655097845037f23a6c39f4d46328d633f944a316a SHA512 9158cc0f1c7b54d84e5c15331ddcf6056b5eb654c0ad068e058eedbea99bb87c1b2e759b57872a86d76d83d6807500989ad6bbf87f1c0210db2d4dab100933ea
 DIST axel-2.17.9.tar.xz 204212 BLAKE2B 8ec63a5ccf73bf8e17c559b7fbce08ee926b0001b1d6f8ea09cbe1a7c600ceba69b6b6ecd19f989da333b57ed11e9a93913b2fa520d7e56b7d796cf18dcb9f1a SHA512 a0cabf43f451d61f4b1f4892a381fd5cf4088f7148502bf4e27d1c98177c3777bab9b732780cb9ba60c45aeead6cf9b79f870ac16db7148180f26350e69d8b01
+EBUILD axel-2.17.10.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936
 EBUILD axel-2.17.8.ebuild 1054 BLAKE2B 4b125d7d707116374d3c66342a70d174eee139e5f5ba07ef3d9b7bd8d2da2a2c906aceea4b751977c8bedf626d5bdef54b11263140d663f5559cc92b67702b44 SHA512 982df8b1fe6e40cda200318ecb32058c9d31889a8473f7124651353e0897b79729f4d3cd4697957a1047dd3a12890ad492481f3118a2539c3577e95bc7d0dcf9
 EBUILD axel-2.17.9.ebuild 1059 BLAKE2B e30d0a04e6d39c123c72ae51de2db98dc3cb9661010452a699139d40a03216dd788ccaff6e2e57230cedb104bcf992f0b224c62866e61b41afd1bbafdbc3b8c2 SHA512 b1b03f38c0c126b422732ae3cfe278b2270f46e812179aae7c2d2b68ed44fd544af0183291e17ac83474f45f62014ff0d4f6220d79f0ef41251c6e29900a6936
 MISC metadata.xml 334 BLAKE2B cdc0f78ca802b6c5268d4f3642637af74d419ba07fb07a2a0f0e21dfdc20de3301ee91d7b027b4fff5c1f2eca4dc5cd395dbf916ab7d2bb6cac9ed85b228f5eb SHA512 e23a07690d4d2f1b26e90fb151d1b7afb922649c4989b4f4b8e9dafe3024c9b7dafb6dbfa467731055d605e101cf44d3c17be3d6f6f99629063cc42f8b616449
diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild
new file mode 100644
index 000000000000..dad9472d9679
--- /dev/null
+++ b/net-misc/axel/axel-2.17.10.ebuild
@@ -0,0 +1,41 @@
+# 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"
+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, one can configure make.conf with:'
+	einfo
+	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+}
diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index c27caf6e2472..1ee496f37621 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,5 +1,3 @@
-DIST batctl-2020.2.tar.gz 112155 BLAKE2B 9d36baf4f728163b12d63bf2b690b75633119ebc22a734668aaaae97d9c0a37ac1906dec40f62987d7c9db2ca6b0c7867164c989f3f3f5834bbc5c562b842852 SHA512 4990eece371320107cd522f5dc6ff4ecd2867d8b77ddb8a09b8c8fc81c6cf2a88df6635f026b16a2c59fc05532a82ecafae206fb1581ac7e1f863043eb3afa93
-DIST batctl-2020.3.tar.gz 112394 BLAKE2B 07774836244120bde930afd6cebc20712e7a59571d19a6ea67a88a17e0779df51d221742cbbbee5c1ee086c7b75e8d5452534c971f0f08f081dd2d7f607764bb SHA512 fc93d4951e2aff91b9a5dd6c7f815bf1faaa08e861ab0116091fa796eaf95ba1b636fb057642b7ae7cef57832841d2a3ab8cdb2675ed372a303f8f5e16430395
-EBUILD batctl-2020.2.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
-EBUILD batctl-2020.3.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
+DIST batctl-2020.4.tar.gz 112430 BLAKE2B 3fde106d7c422ed8bf8b259fc4cf95e0732a893eb06eb99da961c2d5664079a3611eac42491855288b42b94de75b642ea515024c309ec2d3d885ebeba828ec3e SHA512 ecb7c83883b7ae2a4cebbb4319ad7f6c2138d68b91cd24b9753b54e8b0c83080e1358dc61a6bd45d03cc64132bc4f2516b3fab422f71a1e63f53a0e2187fd7e8
+EBUILD batctl-2020.4.ebuild 768 BLAKE2B ca5d2c954323ad5bae7fd25e28d424b7aa4199c74fe0fcb830c4a1b29efb7eec557820c5002e1712398944cc6d01ad3059ade5364c2e94a20fd49111b621ab56 SHA512 4e41451bd50f8ff05af910972c7eed68f045aaf41c8e9e2a387ccf35b9f8d36d5cc09433d57ce664d242a0dbe26d6b04f92d65efe7ef49cbe73acd3d32658e45
 MISC metadata.xml 375 BLAKE2B 63ed1708614d32491216fb627a3f16a07a9de5d8d4925e2676a61744c5ec3a6d398ee838c8bbea0b5d50101d27383c9484c508dc2f6a9f4d953b67d8d2d93235 SHA512 6a83a787d099e17f964e466cfbeed9ae40ba657d21c9881c289ddd318572e292fb3202e95f413e2e3807f9f35201f40458dd0da74adf5af790dd44a0242bb8b0
diff --git a/net-misc/batctl/batctl-2020.3.ebuild b/net-misc/batctl/batctl-2020.3.ebuild
deleted file mode 100644
index dc9f33ff9204..000000000000
--- a/net-misc/batctl/batctl-2020.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="BATMAN advanced control and management tool"
-HOMEPAGE="https://www.open-mesh.org/"
-SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="dev-libs/libnl:3"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if ! linux_config_exists || ! linux_chkconfig_present BATMAN_ADV; then
-		ewarn "batctl requires batman-adv kernel support"
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" V=1 REVISION="gentoo-${PVR}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc README.rst
-}
diff --git a/net-misc/batctl/batctl-2020.2.ebuild b/net-misc/batctl/batctl-2020.4.ebuild
index dc9f33ff9204..52be9621f8af 100644
--- a/net-misc/batctl/batctl-2020.2.ebuild
+++ b/net-misc/batctl/batctl-2020.4.ebuild
@@ -12,7 +12,6 @@ SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.t
 LICENSE="GPL-2 MIT ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="dev-libs/libnl:3"
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 4c786b880232..38e40d3e410b 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,4 +1,5 @@
+AUX bird-2.0.7-gcc10.patch 460 BLAKE2B fda9c1ce155d1d4842fec83ede52847fe895ea406cf3d6b715ea2bea01843604cfd6c2957f6d64847d8d73f21a9d952f8af07d78e7261c585643b7c33727f107 SHA512 84a187e4dc0c48efb9b8e0248dae90669c93abbc2d26b58a1f197420100a69806f80650ac90e064947984d7b1a2f9c5598ffd021a97bee10420b4c61d9cf75c0
 AUX initd-bird-2 1169 BLAKE2B 399481b20099d54f4a4f0cbffa2d9d080f090e15fa1bb9e0613469d94a895fcff3708983defe6d9be181f11ad18598e7e36d411cfc8e07b59c78a74890b5c1c3 SHA512 42224f1ac8ac53be1e0f2d30ecba0fa9ac491494bb6b6147940455538623082f4111731463daec15cbc7c10a90c440d36e27eaab1193f9385488ab6683e15f55
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
-EBUILD bird-2.0.7.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
+EBUILD bird-2.0.7.ebuild 809 BLAKE2B e5fe5d1bc763c46d9249d87460112134f108fa92aa05b7b4c7e6715fe4695beaf0d00de044432e79534647ef9340b5a95326b5b837c2332b55cf4071bc0577e5 SHA512 31c7e720b065945f46a1d9ffd704bb31164d1f886e03d518abad23bc15deed66a923b5ceac1f3da21f9d7e806182783306b71dc27244bf4f0a2fa639948c05bc
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild
index edc17f5b33c7..d2f563e29758 100644
--- a/net-misc/bird/bird-2.0.7.ebuild
+++ b/net-misc/bird/bird-2.0.7.ebuild
@@ -18,6 +18,10 @@ DEPEND="sys-devel/flex
 	sys-devel/bison
 	sys-devel/m4"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}/var" \
diff --git a/net-misc/bird/files/bird-2.0.7-gcc10.patch b/net-misc/bird/files/bird-2.0.7-gcc10.patch
new file mode 100644
index 000000000000..5ba3fdaef343
--- /dev/null
+++ b/net-misc/bird/files/bird-2.0.7-gcc10.patch
@@ -0,0 +1,12 @@
+diff -ruN bird-2.0.7.orig/nest/route.h bird-2.0.7/nest/route.h
+--- bird-2.0.7.orig/nest/route.h	2019-10-16 13:45:52.000000000 +0300
++++ bird-2.0.7/nest/route.h	2020-11-01 02:59:41.199775491 +0200
+@@ -458,7 +458,7 @@
+ 					   protocol-specific metric is availabe */
+ 
+ 
+-const char * rta_dest_names[RTD_MAX];
++extern const char * rta_dest_names[RTD_MAX];
+ 
+ static inline const char *rta_dest_name(uint n)
+ { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 7029f2a7a8be..29690ccf0a39 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
-EBUILD cadaver-0.23.3.ebuild 1052 BLAKE2B 48aa748c19ec363da412c803570a0957e5e596540bc305a09b7009650fa97011aefae9e848675dcc69555a0c94e1278c6bf4060b1a1b8aea611574ce30369494 SHA512 334343e416c32d9d0fb9dc05d7b1aefa4f43f9e2bb76f8ce5b9f302567514790897f0e25571a25bd0059e323970e86d38260fc921280319035c40b7e84741d60
+EBUILD cadaver-0.23.3.ebuild 1055 BLAKE2B a3b6a513f8cfd307820fab001a37ab390bd1d976787b111e86f0b5963ace3ab0b641474aaf5ae125b7a946e5d307650051e23957c3f952fb7785e3d85561def6 SHA512 642846b3e1f15444f9818306653f27f6b3296f3f4aff4390b0fcd0388f2a21856185a0c77664952eee3f3838c90780ef8e47cd49da75361d6f4cecf3becf0543
 MISC metadata.xml 364 BLAKE2B 4b056d98adb1b4ccbce29960437043811c10e06e014f0dc163fc74eeac02a149a6ea657b208f4db5ff43543cfb5ead80d1741c3ae897862761f34bdf80cfbd08 SHA512 aed78883d0c6c7c32429fc10446f79116b8b2a2321f3d473021b79ff07a67084141f9806c38da292e536e6f8234771a1f9bb7829d1968619769a30db1a818877
diff --git a/net-misc/cadaver/cadaver-0.23.3.ebuild b/net-misc/cadaver/cadaver-0.23.3.ebuild
index e6b4ec10f0a5..3c9576593434 100644
--- a/net-misc/cadaver/cadaver-0.23.3.ebuild
+++ b/net-misc/cadaver/cadaver-0.23.3.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 
 	rm -r lib/{expat,intl,neon} || die "rm failed"
 	sed \
-		-e "/NE_REQUIRE_VERSIONS/s:29:& 30:" \
+		-e "/NE_REQUIRE_VERSIONS/s:29:& 30 31:" \
 		-e "/AM_GNU_GETTEXT/s:no-libtool:external:" \
 		-e "/AC_CONFIG_FILES/s: lib/neon/Makefile lib/intl/Makefile::" \
 		-i configure.ac || die "sed configure.ac failed"
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index a47b1b15a9a4..177734f91ed4 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -5,10 +5,8 @@ AUX chronyd.conf 390 BLAKE2B a0058c72ae04371aa273d71f01349a00dfc0d66c016e6c2d977
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-3.5.1.tar.gz 459902 BLAKE2B 503402c0dd68a340eb5ecd8b57dcb83d90124f31e8deb6e20bd1e9ed19b5dc952fa7f40a697d0d0cb77c349c9f3297dcd32265d77670a71836ba8709dcc83053 SHA512 489cf614bfb2c1e024343af1316c339b287ed5c7b6cec15b44ef3d90512036fb1da3fd627d291a193c59d9c5c095afa66c529eeb6fd0c1bbc8256ed8873b7984
-DIST chrony-4.0-pre3.tar.gz 539117 BLAKE2B f26fcac8e29322151251e60b385a815c53155f163d7ed1e1269f90f3418c59ec8f4952b1bba1203549607c63bb373cbaab17af933e02e659eced91827519bc6b SHA512 e52f2454b0cbe60ab7c8975deba499f1ff2e84cd1c3d0a0fb208f11f12ca762f2d0cd74af7aacc8022e628cdeaa4ac388fdd134715cc3e274b3818d5c12da460
-DIST chrony-4.0-pre4.tar.gz 544660 BLAKE2B d7f25a980a8cfd9c56fdf4f8ab3dc63594a428e0a18a5bb3b93488ea4db16201e67589ac8a0d966dea4a06c7ff9c4dfa5a1adc3a77849f69d594305e5961a1c8 SHA512 81471682b091851f79dfe08315a016c01199b850a1cc6289a3f3d6f56df2ab415266e156900f2e9d60804197097ff8bb89bf7c8072a90a05d6f257b5368e5939
-EBUILD chrony-3.5.1-r1.ebuild 4761 BLAKE2B d0bf0aa6403b9f4d691d41a4fd77de3b2de15783ebb445c403ffd3777e3888ecc659e05f131a2b0465e20c5f64c4f6e9084680ed01bc75f410b93caf13b84f49 SHA512 b2cfbab377cc697cd8903708dd870b7bda141a32b9a5f4f4a155efa93dd6ccd5af815c98005a074e039b3645938c3c684ee9d0afb418de6236ddf8db903394df
-EBUILD chrony-4.0_pre3.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
-EBUILD chrony-4.0_pre4.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
-EBUILD chrony-9999.ebuild 4768 BLAKE2B c61ef9e4e476be7a7a430452d74ce21cb7581a95beeaf435e83bfc0f5f75dd5740698d5f70ea9622e8a2fb253d6add17918407ce0ed0256dff9e86ad305e1c09 SHA512 75fd0d5aa18d630b5e3ce7c80696b51d3ca70780250ef718e2e4dc71bcc37b99aa235a20b59aad493dbd8ff9c3855831e2dc2a56453534917b01be497c7ca335
-MISC metadata.xml 1744 BLAKE2B a30c56ac26aca1450ed5654e496132b47eb498694a2c5da6bcdd55f974f9379835aca68dc4293cf07a13aae0d1507b3b1db473bbb5fe32e02f82f403ae069420 SHA512 4bf5ef57e61ac80f7c45662125a6b5000072edf698be5c48333ce2a286950627381afad062df12268eb4e628a00d48f37e401aa79bd6e43a7e87a74c605a7176
+DIST chrony-4.0.tar.gz 546939 BLAKE2B 1d4035977be3603b34024c5c1c2aa5f2b4aca03fe7dc1eb41be2e9aeefa06e20a5f74776c50bdadaffba10ae25e7980bcbd9cf2b999bd73087728afe7a80253e SHA512 a1c11a386c43f495910f7f2e9b5fbb1652c3631471d182b9b8203dfef98611d11535ad547a879856551263aed0ae2e30e4135b8ed89553684706166bc1c725c9
+EBUILD chrony-3.5.1-r1.ebuild 4760 BLAKE2B 9764ff19b0a5740e4d535c713fceeecfe8ae11b9f694cb3b736d392a50df46480fea7ad511d39e8719dd4a8311bb101e8ca62940b26bb5b7218dc4d9d5c57bb4 SHA512 b56d4b1362f4b0c6ec71c9690aec2d7106e488cf8af65f04b0c3ab49267a2a1123c178430f1528a91f27f488f9f295d79c0fb3d42e3f247e1e44ca26f84d7796
+EBUILD chrony-4.0.ebuild 4280 BLAKE2B 1d5b51c22d9a321172021ba50ac7129a53c119b7e7027c28489596f15b0365422545d9613c001feee05ae1bdc9e5898e334a787ac91aa9d257986e38bf4146b5 SHA512 09ad193ad9f0504137f9d471557354582c093d65ce1b56468f16192d72da3f17c7e5744d893e8e3cdd7ef68a54e4deaa1d36f06421c996cd9c39b2c56a09cfee
+EBUILD chrony-9999.ebuild 4287 BLAKE2B d682d68657aab4b753b21963d0276688a16a84ad37dbafff885a7983cf0eb48bb8493251649feabe493be6393eb48fb68a8140b6459f3d224e078f80ae4ee0dd SHA512 044a352a2afa9e875244e9bfbb7b197bb2693c0ddc52e6d88296536fa6c15fa8811f45684ca8c594f2d1150f46e0ef6178e5e7dbedab4c602f56f7bc5cbd2bca
+MISC metadata.xml 1936 BLAKE2B 46778f29ab04904ff6aa5212e989d1384f40d1923a04323837845af7563cffcc652047dae4ab8c535dcf1d2986e851c96aad4160cd4910934b3ffc347f473a21 SHA512 1094233e25ad5630cf537888304bbfd16fb8c1da36873025b0b937070733d0adbeebedc4c04383f806f2dc825013f53133fb81cef597afad16874510fa45c10f
diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild
index 9a2af1bd3eab..ca404b746fd1 100644
--- a/net-misc/chrony/chrony-3.5.1-r1.ebuild
+++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/chrony/chrony-4.0_pre4.ebuild b/net-misc/chrony/chrony-4.0.ebuild
index b5c97cbbd863..efa9bc015ed1 100644
--- a/net-misc/chrony/chrony-4.0_pre4.ebuild
+++ b/net-misc/chrony/chrony-4.0.ebuild
@@ -2,59 +2,57 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
 	inherit git-r3
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 else
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 fi
 
+S="${WORKDIR}/${P/_/-}"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
-	+rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
-	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
+IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+REQUIRED_USE="sechash? ( nettle )"
+RESTRICT="test"
+
+BDEPEND="nettle? ( virtual/pkgconfig )"
+
+if [[ ${PV} == "9999" ]]; then
+	# Needed for doc generation in 9999
+	BDEPEND+=" virtual/w3m"
+	REQUIRED_USE+=" html"
+fi
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
 	libedit? ( dev-libs/libedit )
 	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
 	html? ( dev-ruby/asciidoctor )
 	pps? ( net-misc/pps-tools )
 "
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-BDEPEND="
-	nettle? ( virtual/pkgconfig )
-"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
 )
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
 
 src_prepare() {
 	default
@@ -86,18 +84,6 @@ src_configure() {
 
 	tc-export CC PKG_CONFIG
 
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
 	# Note: ncurses and nss switches are mentioned in the configure script but
 	# do nothing
 	# not an autotools generated script
@@ -106,6 +92,7 @@ src_configure() {
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
+		$(usex libedit '' --without-editline)
 		$(usex nettle '' --without-nettle)
 		$(usex ntp '' --disable-ntp)
 		$(usex phc '' --disable-phc)
@@ -114,7 +101,6 @@ src_configure() {
 		$(usex rtc '' --disable-rtc)
 		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
 		--chronysockdir="${EPREFIX}/run/chrony"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild
deleted file mode 100644
index b5c97cbbd863..000000000000
--- a/net-misc/chrony/chrony-4.0_pre3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
-	+rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
-	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
-	html? ( dev-ruby/asciidoctor )
-	pps? ( net-misc/pps-tools )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-BDEPEND="
-	nettle? ( virtual/pkgconfig )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	sed -i \
-		-e 's|RELOADDNS||g' \
-		-e 's|pkg-config|${PKG_CONFIG}|g' \
-		configure || die
-
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf || die
-}
-
-src_configure() {
-	if ! use caps; then
-		sed -i \
-			-e 's/ -u ntp//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	if ! use seccomp; then
-		sed -i \
-			-e 's/ -F 0//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
-	# Note: ncurses and nss switches are mentioned in the configure script but
-	# do nothing
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex caps '' --disable-linuxcaps)
-		$(usex cmdmon '' --disable-cmdmon)
-		$(usex ipv6 '' --disable-ipv6)
-		$(usex nettle '' --without-nettle)
-		$(usex ntp '' --disable-ntp)
-		$(usex phc '' --disable-phc)
-		$(usex pps '' --disable-pps)
-		$(usex refclock '' --disable-refclock)
-		$(usex rtc '' --disable-rtc)
-		$(usex samba --enable-ntp-signd '')
-		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
-		${EXTRA_ECONF}
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-hwclockfile="${EPREFIX}/etc/adjtime"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call
-	echo sh ./configure "${myconf[@]}" >&2
-	sh ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]]; then
-		# uses w3m
-		emake -C doc man txt
-	fi
-
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${T}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
-	if use html; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	if use caps; then
-		# Prepare a directory for the chrony.drift file (a la ntpsec)
-		# Ensures the environment is sane on new installs
-		fowners ntp:ntp /var/{lib,log}/chrony
-		fperms 770 /var/lib/chrony
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
-	HAD_CAPS=false
-
-	if has_version 'net-misc/chrony[caps]'; then
-		HAD_CAPS=true
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && use caps && ! ${HAD_CAPS}; then
-		ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-		ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-		ewarn "This is necessary for chrony to drop privileges"
-	fi
-}
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index b5c97cbbd863..9bee3f3276df 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -2,59 +2,57 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/"
 
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-
 	inherit git-r3
+	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
 else
 	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
+S="${WORKDIR}/${P/_/-}"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="
-	+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock
-	+rtc samba +seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-RESTRICT=test
-CDEPEND="
-	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
+IUSE="+caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps +refclock +rtc samba +seccomp +sechash selinux"
+REQUIRED_USE="sechash? ( nettle )"
+RESTRICT="test"
+
+BDEPEND="nettle? ( virtual/pkgconfig )"
+
+if [[ ${PV} == "9999" ]]; then
+	# Needed for doc generation in 9999
+	BDEPEND+=" virtual/w3m"
+	REQUIRED_USE+=" html"
+fi
+
+DEPEND="
+	caps? (
+		acct-group/ntp
+		acct-user/ntp
+		sys-libs/libcap
+	)
 	libedit? ( dev-libs/libedit )
 	nettle? ( dev-libs/nettle:= )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
 	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
 	html? ( dev-ruby/asciidoctor )
 	pps? ( net-misc/pps-tools )
 "
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-BDEPEND="
-	nettle? ( virtual/pkgconfig )
-"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
 )
-S="${WORKDIR}/${P/_/-}"
-
-if [[ ${PV} == "9999" ]]; then
-	BDEPEND+=" virtual/w3m"
-fi
 
 src_prepare() {
 	default
@@ -86,18 +84,6 @@ src_configure() {
 
 	tc-export CC PKG_CONFIG
 
-	local CHRONY_EDITLINE
-	# ./configure legend:
-	# --disable-readline : disable line editing entirely
-	# --without-readline : do not use sys-libs/readline (enabled by default)
-	# --without-editline : do not use dev-libs/libedit (enabled by default)
-	if ! use readline && ! use libedit; then
-		CHRONY_EDITLINE='--disable-readline'
-	else
-		CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
-		CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
-	fi
-
 	# Note: ncurses and nss switches are mentioned in the configure script but
 	# do nothing
 	# not an autotools generated script
@@ -106,6 +92,7 @@ src_configure() {
 		$(usex caps '' --disable-linuxcaps)
 		$(usex cmdmon '' --disable-cmdmon)
 		$(usex ipv6 '' --disable-ipv6)
+		$(usex libedit '' --without-editline)
 		$(usex nettle '' --without-nettle)
 		$(usex ntp '' --disable-ntp)
 		$(usex phc '' --disable-phc)
@@ -114,7 +101,6 @@ src_configure() {
 		$(usex rtc '' --disable-rtc)
 		$(usex samba --enable-ntp-signd '')
 		$(usex sechash '' --disable-sechash)
-		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
 		--chronysockdir="${EPREFIX}/run/chrony"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 9b7e225c3ada..6d7a44f2f91e 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>jer@gentoo.org</email>
-</maintainer>
-<longdescription>
-Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
-the accuracy of the system clock on a computer. chronyd has been specifically
-written to work well for systems which have only an intermittent (e.g. dial-up)
-connection to the network where the NTP servers are. It still works well
-in a "permanently connected" mode.
-</longdescription>
-<longdescription lang="ja">
-Chrony はコンピュータのシステム・クロックの精度を保つために使われるプログラムの
-ペア(chronyd と chronyc)です。chronyd は NTP サーバがあるネットワークと断続的な
-接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的
-な接続でも機能します。
-</longdescription>
-<use>
-<flag name="cmdmon">Support for command and monitoring</flag>
-<flag name="html">Install HTML documentation</flag>
-<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag>
-<flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
-<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
-<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
-<flag name="refclock">Support for reference clocks</flag>
-<flag name="rtc">Support for the Linux Real Time Clock interface</flag>
-<flag name="sechash">Enable support for hashes other than MD5</flag>
-</use>
-<upstream>
-<remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
+		Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
+		the accuracy of the system clock on a computer. chronyd has been specifically
+		written to work well for systems which have only an intermittent (e.g. dial-up)
+		connection to the network where the NTP servers are. It still works well
+		in a "permanently connected" mode.
+	</longdescription>
+	<longdescription lang="ja">
+		Chrony はコンピュータのシステム・クロックの精度を保つために使われるプログラムの
+		ペア(chronyd と chronyc)です。chronyd は NTP サーバがあるネットワークと断続的な
+		接続(e.g. dial-up)しか持たないシステムで機能するよう書かれています。ですが永続的
+		な接続でも機能します。
+	</longdescription>
+	<use>
+		<flag name="cmdmon">Support for command and monitoring</flag>
+		<flag name="html">Install HTML documentation</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for hash functions</flag>
+		<flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
+		<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
+		<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
+		<flag name="refclock">Support for reference clocks</flag>
+		<flag name="rtc">Support for the Linux Real Time Clock interface</flag>
+		<flag name="sechash">Enable support for hashes other than MD5</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:chrony_project:chrony</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 105dae3b30b1..83cf446be95d 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,3 +1,5 @@
 DIST cmst-2020.05.09.tar.gz 2727228 BLAKE2B f24f05e14de589381dbfc7c0087d08eed23ed0ee4df23be7fd2bf25d8c36519771aca39e74942ec01fe6327b5ab52c74336b85f9b61da3d8a9b83c2a8312721e SHA512 9debc16d34fa8fed37f514c70282b7ccdece8da3612332a886a2b1b5c6f6ff86c046c5da6272c00836f0acc3cd6dd82321d3cb2f81784ea1512719b70eba1b6c
+DIST cmst-2020.11.01.tar.gz 2818638 BLAKE2B 69cf85abb0beebfcf3a2d6d3af8281de43d795a104a8d9f5bfbb37b6dd1c9541910fad4ce536643ae0cbe8ef1e0bdc31016d9f99056de4279123bb5d8a428d1c SHA512 cb8082ac7e1d377709a7d3fda49ed7a99ef7a9c5eb00ca24423685a5146f519bc810c37140755f4f399957781af09de75e47de8b209517c74ac55f8e5758986c
 EBUILD cmst-2020.05.09.ebuild 842 BLAKE2B 025957f9befade5083cea90cddfe9c8c751b1291afd3db59e76017ed731727083a3bac9295809d87594483797b8d55afd67496b4cd9c3c3ce5b72ece2f5b8b09 SHA512 520b528cffafbe7fa1133f10a57621777adf906df142e6bf7ade46ea932dd7c1ece14807f47148a5262a613f2e73a3f9f53ff455916f059749011b71c24937a6
+EBUILD cmst-2020.11.01.ebuild 844 BLAKE2B 97bd9dd4423cbf8293e143b962e3365e96da3f4bd70ad1de04319e245ab898c3d1fe42ebf1d250109045b03b8ba5a3928019807afed1515fa22c38c2edb748a1 SHA512 052ad0cf61f8f8ed17bcedbc595310b72474dc20af061a1e2c8c420e61ebc6ff4f38cc8ad3a1a2d2011daa4868520f4905b22f34b7681d9e94d8fa93609a62b5
 MISC metadata.xml 389 BLAKE2B fa4bcb790a8e29dcfb5d87f3b675824dbd909a148253470189db24b6bd9b4282d1ddbd1dbedaec31f4d0dbe07cfdff0cc7331d6863842f5db7e597e7614698ee SHA512 b589825d436c4ad3b0781acc5b64cf044f056a70ca72f52cb0341b05e87bf8b269049dcef4e7a6acb8bd76c3a909eaa7c8a0bd77794e7266eb8e7cb7f6fbf7ad
diff --git a/net-misc/cmst/cmst-2020.11.01.ebuild b/net-misc/cmst/cmst-2020.11.01.ebuild
new file mode 100644
index 000000000000..02c5f056724b
--- /dev/null
+++ b/net-misc/cmst/cmst-2020.11.01.ebuild
@@ -0,0 +1,43 @@
+# 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
+	gunzip "${D}"/usr/share/man/man1/cmst.1.gz
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/connman-gtk/Manifest b/net-misc/connman-gtk/Manifest
index 894fd5f5b223..a231012916f4 100644
--- a/net-misc/connman-gtk/Manifest
+++ b/net-misc/connman-gtk/Manifest
@@ -1,4 +1,4 @@
 DIST connman-gtk-1.1.1.tar.gz 61789 BLAKE2B d04d508b5bb03abe78c9b6734df919b6589cea9e7f38c41059210e62795ce79a17b6ba8b3ab1b0c403a43fa2712893bc0d00b1e5f15d9910ca45108b9e760e12 SHA512 78fd41a37370c76f118e3fb8a707b96fd6bf1234a8832d047302d4b0fa350f87316f6e2e749860b2cdf0ff6e6eb76e4d7d398dc7fc084403ca2f8682d2907553
-EBUILD connman-gtk-1.1.1-r1.ebuild 929 BLAKE2B e6996df7e8ff5b678c28f2377c20ce6eb3ce3b3d2667b0ec28c3aad8811a5136dfe3936d49a0e3aedc5555836aa6c2fcf11b28f7e9756d2ce45a6537250e49a6 SHA512 ca4578d8d480b9a59d67297ecf4620251b540ffc38a9d6d022c7485c9698f8b0e26a48b15d50a388bd168c2ef638b34528fe628535fa88f23655dcd71cc15464
+EBUILD connman-gtk-1.1.1-r1.ebuild 927 BLAKE2B fc25ac4b73cfa12a5d15aad10e12beb342e915bb1fbc24e7416cd8624ab7edbb7438a80fcd246b77db1b8f2a2fe24a75164ebcde712ece59e754a634566f0a38 SHA512 fe7ec89bc2bd316defdab51bd58bbab03828c5442287ccb578531784a6231811fc38ca1aef7d480790b9deb75d0d62c37e34a2103f28fa6f7256a5387f102c0e
 EBUILD connman-gtk-1.1.1.ebuild 939 BLAKE2B fbf8d281f22cbddfcac61b734121df5479d89e3c4c8027751d49d5bec9cb835a9afa81143cea2986db16ca44e0567ba618898d85be6be070ea66f5e462211aa6 SHA512 628b59ca685ec0d8007fa244cf893f7b05ba44e89ad1d10f5cedb7ae9b02a58ebf3151f0dd2e2f532bf8d3f429f75f5d31651dea086257450756bb40270f5296
 MISC metadata.xml 488 BLAKE2B d55fe987103c9440307fc9db557cbb4c6add9b960e642b0d6f5735aafec2a29156a0a4ca6d51bb71c4e238bd897430e4e4065383b88ffde803bf53aae99d1314 SHA512 f84f35958b032afd49633c59fac3474148d01becdf968d62747c8a2d99aeec4f90cae7242b7f7fc00cee2903a9188bdc206308a7d692e136317959ebf9019867
diff --git a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
index 3888b84171b9..c950b57ae3c2 100644
--- a/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
+++ b/net-misc/connman-gtk/connman-gtk-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jgke/connman-gtk/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="openconnect"
 
 CDEPEND="
diff --git a/net-misc/croc/Manifest b/net-misc/croc/Manifest
index 9ba97c7b2665..e9cceaf86364 100644
--- a/net-misc/croc/Manifest
+++ b/net-misc/croc/Manifest
@@ -1,4 +1,5 @@
-DIST croc-8.3.2.tar.gz 2542462 BLAKE2B d113164e0cf56b1d996df5c1e3dd345bfa26d3c18c4f78865002641903b76fd64ce0470ccefcb4398feca8e0431e586cd842d8a56e0bf15688b12c3cfaa79d68 SHA512 d1ca24f41f21acb9a4548697030bbdbf67faf220abeb1b1eb22ad3309c89b0d39cae5578c21ae66831e7d043dfa7fa3075c20175cfbc55263853a127151ec754
+AUX croc-disable-network-tests.patch 813 BLAKE2B 305ccd0cbfde01e44bc89cc9bd5545134b02df4f91e217f4eca71cbc4b4c0f2fc908912f16b47fd4867c4472cfb861bc17263cf378106d7542a7ec78287a69f3 SHA512 f31578ac1530e20715a4be305a18245f201ea16514bb265c0b676d72190e3ac90d89d1e846e5bfb8199fc0e532ed56b890b7e2b1389834564686c7bb36fc2e46
+DIST croc-8.6.6.tar.gz 2591220 BLAKE2B 60d5eec9dbf603dc9e8d77a2c700bf86fb0a03f130e57015f32c68d87848681086b88d84d90e9075650f67bd288fa81f641c11a75c230f65525127ba53401fdf SHA512 4a7b7393f33f713c14b3a1c1276553452c365d1494ff523c5f77d3479b6c875edb07590f6d4314da403e1974e785ef0cadf806f076858ba1be2eedb6d9166721
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.5.mod 43 BLAKE2B 60ec6257dc0098e3dabfb32b6c668db9159d69dfc7daa06b9d7f9089f4a6dfc11d2b6d39393e1b990f6ca126019baa1b3d99364fe8a6df9ae323626c8d82494c SHA512 be1111b482157b8c8dda0f45a71e587b51ef78cc9676db4cb560bf0e71c112f45bd048bab7f1b0a64651777bb395c0ce210cf3df20a4afe08e66a42b6da89765
@@ -13,8 +14,6 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.mod 42 BLAKE2B 82ce41a468f86b7e890b3f78540b186af17a4dba7dc95f9e19ae08a0008af3ab1a4f6dc4038233dad1cc62b9c8e0950c6ea062f03f4502cbccb256a84c4cea45 SHA512 330121b143198b7a6564df33fd8cb6b2526d641c08301f7e26c06a4274e8e038b16b0bc833ec3363770f0c177882fe0e8021d721a2fc32e8050e75a2051febf9
 DIST github.com%2Fdenisbrodbeck%2Fmachineid%2F@v%2Fv1.0.1.zip 32312 BLAKE2B 37cf6c05b306d6d88aaf6455a0068dcd5744657e057529ec6e62b1117b87c09c40d159e1d1205f6751111c4eea3194cbfe199de5d7a74d3a0ada349ceb4b8e51 SHA512 ca740e3296a7699459cfc4ce454277c7b5dc2bacd12ad5959f6d2a77d9d268f6671d4c30b1c84072d53045935838005d2dcc5beeab1acfee6e952c67e0bbc859
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
 DIST github.com%2Fk0kubun%2Fgo-ansi%2F@v%2Fv0.0.0-20180517002512-3bf9e2903213.mod 34 BLAKE2B 86aaf734f424439c38d57c59bb08da879781d897196a6f1c6486fe74677d055bc301fdfd72825e079b50bb04ef2a12db0c0e65a0a59f0be65db12f03c731bed9 SHA512 8664f01b08e210d9f70e72a1c8add0547055979561ebc689e9b7f601f4ee8359d00649a5f8a0bc0c9715009ef8066a1924f5311377b7346685b3bef676481dcc
 DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.mod 142 BLAKE2B 61dc9cff180fdd116136f37018e74635e19370e37f237c8cf7b52cc026d91ca0e97c1da39232828405f26b786fc39a81b70a2ffa09a9279bdff711a0f219072f SHA512 33c28ef3ee2d71f8f2a4c02a443bf9f40c6b7bab1e56a686e5f7e0e497eae7f2878d3e725be8cf15ad1be26716ab0d783404529f082a36056173f718f4bdd68a
 DIST github.com%2Fkalafut%2Fimohash%2F@v%2Fv1.0.0.zip 9682 BLAKE2B 8257caa4722ca71e9155888b9b483aabd2f5ebd4d561ebf263c40c260c9feea01f57844e0952ff890806b2d434dcf3731d859b7d7e5cf08aa8c086bd9522f9b7 SHA512 a297bdc807d24ed88953c86aa0ac320851977324dbff9e00d4e5b813a0a8467b9cf12f6536759a4d87c7695579d2a3efd050991d488dfef4c85c996f9e6005ee
@@ -23,13 +22,8 @@ DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
@@ -38,20 +32,18 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.mod 184 BLAKE2B f67cc91ee946f87065b29c78633866804f158d8dcbfbd6ad24d55f3e44d0ebf32db5666774d7a75920ae456bd16b115c672a2f07af9dcaa92550c1ccac6bee22 SHA512 04fa4c8e8636a01bec227f466844b251cbb74f856e8e1bc04de7401ae1452ecfa2839644a14b33b643d050d8f8edf503681ce0d4ac97bbcf2a5b0a8fdd7018c4
+DIST github.com%2Fschollz%2Fcli%2Fv2%2F@v%2Fv2.2.1.zip 3453563 BLAKE2B fe5fc340884a6d6fb8090b2f2e3f847c9b440e950e2174796e9b8beb5ebba0e8fe3b634d4b52b44dc43246191ae401c3bb02c5206898f81debe1ef07ff23e23a SHA512 79b574582ed35aba46ca953fba610804a3a42acd9b244175862610df26d1e71c8b2c4ebf3c71df5990ec84b26d403484731cfd649051d73cc56e123788230a19
 DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.mod 42 BLAKE2B 28d1441e2d219c8194a4acaaea2d072866bef631fec3e10ccf73527337b09da5a4205a4298f60ed823bdc323a7517e69f3fb1cab925baec13a6684688d8f26ad SHA512 db5dd8742ef68cf0e1710f2065435b07f44899cca8c2bcd4df2a127596ff778661531f45a35a59b981b4fcb246757beea26835ddab8e3f5d24954af616067124
 DIST github.com%2Fschollz%2Flogger%2F@v%2Fv1.2.0.zip 4494 BLAKE2B e17a498a1c54d88a2e98483c52efbd8e0150a728c299e0bb0319ea820cc50276e5f2727c549a126d3094efe9a889adcdc2862286f19fcb870abe8a9157fac4ee SHA512 25f1fde274a499c5ade50061cbb5727f2798158b1547092b298d36b89ed0efcfe84b727e20a3dc980b1f9fcaa1a0dc07f8e0369155df11bd5f76b8fffbb32a64
 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.mod 72 BLAKE2B 5f5815449eb44d202f99b7e2168a08000eba8b70f3b669190d8ebd8d485adada71049cacc71b6e72931d45284565b816597f995e16858b2fd0a2eef2cd815c7d SHA512 eaedd08e8235f2a61d8e3c8e342b1773d2d687351e715adc8ea13d1e49511d16c6f8d5510bba5ffcb9d295a64813d21214e6d55dadcd1c8686f9c3320a9d2511
 DIST github.com%2Fschollz%2Fmnemonicode%2F@v%2Fv1.0.1.zip 21717 BLAKE2B 611144d8f187db3a63bf6c8dce9b2b4752551c412a5228c4d52c7f24cc65336b95e6d2ffb8f20baf50d0ebf90ae77998c6ec6c5618c0fbebf5b312a7b26be892 SHA512 bac0d4ffb2e4bb0dcdcebdd5d651984dc9b1be639a7de249b1ba47bd66d7d4f0aad3ae7b9ba9ea6ba032204e543feb3b83b77e86e7a5de295f2fd06a0f8876b9
-DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.mod 256 BLAKE2B 6db1eae7733ceafbf69c2a627c61260ea496109ec997f1baf03f8d5522b7b723532ef06c91d1b581ff02fbb11eb9f306b0649c1b03846edba123cbb117fc4b78 SHA512 2afe00182ead5ed732add5c73f4268a28184bb48c5c3489d7dd60a661d9dca0ca4240369cbd27e9381d10140bcb3d4f39e73f7e7896380d55dde57f1727e7992
-DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.4.zip 7809 BLAKE2B 90cae180375deefc1cf194f89dd2c356f14de22a6514911ee9e6e0413c55841fc24f7334e9861279b0efce74382c36532595f5c0f38b8cd83d6fdee1d6d55e98 SHA512 ce3df459a08d92b2d6f1f3832d2d8dd44f827f95703e9b11ed0c758ad160c40d8f3ba3b9caf61f448741900ccc718dc65ba5933ab444db06f855510ade7e5a4e
-DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.mod 259 BLAKE2B 5e53a9867d162f1e4e5123307344d1fc8cad3eeaf729bbfccb2ba508f9b454be4bcda796c640840567c677c1881d8d22d0b15d7ed5f09d03dfb98e164c8be385 SHA512 d0cb54b94e22519f0d53e30c2571274deeaf15bda3df9d15e805c83d4efad63902f593761410a8d11871610a2b0ef09f7e6c096080529494511948536b204e36
-DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.0.zip 10286 BLAKE2B 36f83614f5f443bca84956bd58e6d813c97d2627fb4330aa50faa9453f9cab0eaef87dffddf229f04706486d57933ab90fa97ce9a3a9209d2d39c96c23e01cc7 SHA512 08cbb78e55392078b41d287823994a48a8af64649371acbc1e86f9a42c318dca18ce42c54eca65779477f4a454469d7601483b07cce7db3a2c7b40b5b1939a22
-DIST github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.mod 215 BLAKE2B ffd46ea78d3bd4056b847fbc7fe0dc3a0d66311c962e116209c6d36a55310324cd4911a57faa695f8b9fdfa18e44f1feca756746760770c3928f42df428ce97e SHA512 ecff876ae068c2b14b675ef336b2b217b490302d3db183cecc6ab70f981d4b848c4b85acfe9637159bc18002b606904bf318387e9722b995901cca1f3bf836cd
-DIST github.com%2Fschollz%2Fprogressbar%2Fv2%2F@v%2Fv2.15.0.zip 11585 BLAKE2B e601ef9ca149678f6f56e35d3e6248134269968796fe61fc04edfef81199c199c3e28ef1b3981fe388bda92296b91ffaafbd7ea89234b6d541bdeb13de270ce4 SHA512 c9c52f87ba0472d909ce10d9e31bb978334bea9264999591e0c14a86dc39edd05704d8c0174f498617b760d8087d5e9ee585f999aa80d4c039a8720633a7a567
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.mod 429 BLAKE2B 3aea302dca6784c0ec50a040419fdc2537af06f18b469a70777896c34dedd5d21a1a5588f024ee3ea0f9bf77e1cc794405b45b6d705600a7ad0cbb6080679c06 SHA512 58caaaa80b8c2cf73287afb985959b0f31a113fd38fc8d9c635b4fd3a308bab5e6694e49388790d54ecbb3e27e525b62e863a8430b189ff6d4c896d6ed3ed34a
-DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.5.1.zip 605787 BLAKE2B 339fca9864d95f7776dba2eb97a44a3cf55d7155be37bcbc491563ff2e6f8390de842cd3cdb2e8ac2cf5e9add200774b8260778e51f6af944c02533b7600b39c SHA512 7aed0a84d74289245090da6566dd0bb9a0d8858792e31e9fece26344ae8670039a0ec6c4cb6533f7759d098ffceafdf7019adaa853f07e0689ae15b0602ea7ff
-DIST github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.mod 34 BLAKE2B 5f3c9e06283ff0f5bebdd8f2dd80b5c73889cd9c8b4151e1eba6a7d8a32bd5a3d97a8fb4523cddf08f9ed6155b1082fc290524a6bfca218b650dd327a13dba41 SHA512 aeae9f51dff80a8751c736027566b69fdf60131438135e3d33fbba1008c384a4bfdc7ae646357399f04d358c2cd305da3d693f2dfc7d1b67ed2d81e03a67062d
-DIST github.com%2Fschollz%2Fspinner%2F@v%2Fv0.0.0-20180925172146-6bbc5f7804f9.zip 15758 BLAKE2B 09b3b2c9128c1c879299a9224306a940ced1e9d8493d45af7260d95cddf19714f675e620667e90f67da60d1b9170c3df1667f6d10be5675396ad2a3ec06c211a SHA512 0d6489d0f8be43d9a0e5f543d6d4b0c190d34309dcd0dacd4ed0d795015f671a8964608d9235b70b89826af90207226214ceef5f41860ab7d3d6d1fdb7f486b1
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.5.mod 256 BLAKE2B 19d119094547b9ac5fce2b860121ffe2f9838f31216316683b452059887de4dae59daa3f0a867f66f1b4be75423d8811bc75f33181dd72470096b658be398434 SHA512 9d101ee3c638a5ecabf0baeb2243ea62091d188012bfdb82a9a40a8736d7d73a7d1113f55c0c3ceb3e65d94f8a04a0968ce990ea3d0c2709317f3871b313d302
+DIST github.com%2Fschollz%2Fpake%2Fv2%2F@v%2Fv2.0.5.zip 7805 BLAKE2B a31261282d1455050065db6cda411dc2a6b1dfe554dc795d982626fc0e324c2947e57b81c2b8e70ebc757a43e8438285d079aea80972acc387f502dafa82ce9a SHA512 685d9b40355dea010bc84d8e8a82ab2a1d23b9105c281eb56afc4cac2f58454c56cafc19d0c0772d99a81bc3305bf3d6a12b0c172eb308a4543b20a58e217d0a
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.1.mod 216 BLAKE2B aaf844bee244f49ce0ef1f651043215927b4ee80b1447b31eedd1248a61f096b86864a3a63b999b6739700d1da615007dcc9653812dcb48c6dfd570f9a8cb21b SHA512 55ac959bc300d28571b428d2f123b0b4b72c44a2a805b3863741a3f8972bdb1038f333f33f304cf1ada39ef478283ec1ff520e4f9c89640094e4222ce0b2bd98
+DIST github.com%2Fschollz%2Fpeerdiscovery%2F@v%2Fv1.6.1.zip 9260 BLAKE2B 36c17e6ca1b2e03c531389d20efcb50487a8bc817139db7ef8b3d85980bd943a41099db6c21feba1fe0c1e7b0d105425828891154f9b68955efa0a62b3958cd3 SHA512 10d947e15fe64eb8c3f22fb82f2f493d7e5e31663ae1a5acfc4c75de98923b22b6822fec174a945e37eae45c2fa02639f732cb31148260a60981ad53b7b4520d
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.1.mod 485 BLAKE2B 303274b3315a4e7107f1152ae749144afd65596d863409df57528bf599bfc7d5d36e42998bc89ad5c21a09e045476e8f7ef95d855c7cee09e6023919d68a8c97 SHA512 b8d37d5c92b053e6633cd1bac460c807aa87a8c8e44bf9c946809311ddde236ae36dc6470cc76fa49b66e90ae6416c8d4ef420dd81e895ffa4cb7f47f5dbb941
+DIST github.com%2Fschollz%2Fprogressbar%2Fv3%2F@v%2Fv3.7.1.zip 606130 BLAKE2B d7c489e4d02909ef549a2a2675b7dcbc9a70a043d6db37be32f6f2d73307dc9ae7a89fd8ecd1856ec0cd12b9c4eb28041c864273ae36d428a0e592b5c9a95bcd SHA512 53445bdbc383bfa45761dc7b63fe7dedcbcfda73a50bb5c90aa847e6cbbae43192634c9f10d3e2509c1a6480ecf3a3de84fcf172010f57b631f9e40393799413
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
@@ -59,41 +51,34 @@ DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.mod 32 BLAKE2B 714a7fdeaaa7ea25dedf0279e7edc1939ae954f9214851f3b8ca0baf2be779b323f79dcf86c34026dc48a9c12f448d5b70f0088292a0f5d7e77706eccd7167df SHA512 dbf23e08092d028c7f03935ddf3e1f63b2ab16781d713f1339a0dfd1199217e80e01a4183f1b18c25db99077b9f059baee8016ec069cac6252839f79008ad09f
 DIST github.com%2Ftscholl2%2Fsiec%2F@v%2Fv0.0.0-20191122224205-8da93652b094.zip 72830 BLAKE2B 5ce514604ab22c4d54b49be8b79448ccd2218c7d189acf746b74b2bf6869ff3dc74a99306b89bc7ee198cb78f717f05640ba6ca365c5f54b999730283354e4eb SHA512 72c9fdf871d60349e2dddc1dc70ba27b22632b0f0f992e7fa53ac89fdb7daf952fe5ac2c2a93a3875ca036cb7f14dff7c555267468fe9f533901d3766ee674bb
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47efe3fc06e2b99b939997554e58fc2548310656f990cc44dc1787d061a4bcfdf6010a20bd9d469c6b66dbf16dabc205357f28cd46322a2442a1c3c093 SHA512 087961c76752484ae4be8d7f0b79538638428e35ec47db185f57a6ec07e3b60d55873ee0801919b169acd5a1e36c5150613e528fc051910eafa362830791fda4
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip 1874278 BLAKE2B c9d8d7150f589d4b313bff96b41e1a24616db4e9a6447f1a20b81e15c35d6dd966507f5b24564afb904e81768f6c226ee73d3bf4ac3ce736c0276eaabc38a139 SHA512 61a5eb5e3af434483bfdd470a028b10c7ea6bf149e0cb4d4443cb8325417cf5b4e85d2fb2e6335dba74d366b80d4bf0b6d6450dbcb3f3e06714c2bc4b0ef6f75
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201112155050-0c6587e931a9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201117144127-c1f2f97bffc9.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201117144127-c1f2f97bffc9.zip 1861832 BLAKE2B deb4eb00f377c08caf34030ef7185876280ec008c54f8ad75b44111b33421b4b69b203639e4b82634c986a6397044da1ad8c5d05ac663b8f9808b7f61a613882 SHA512 63eb1193149e1caa79fac22be5771a7a65176aad53424d823ce0386089f4b78caf29c293b815b3c4306345e01141cde938a273bc732e0b0ba78fa16a5e5547e8
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200904194848-62affa334b73.zip 1505530 BLAKE2B b26f3f943953ecb17996f44c0e8278b56c7d01648227cc0b73cbb17e9fc44b40bbbac34ac4996fb88115a6451178d3c94f4c17a43cedd30f9c147312fd7e04ce SHA512 7b36db6f767f03d0a14ee599c6d1bcc7cf5cb8df69b9dd46d7544aac59ff6aa1bdf38af0f3f31328f02b7643f7655b375f8116f829b22993ae49951ab28cbef9
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip 1580428 BLAKE2B 3bc05480dc51b5f2b1b67473a4955a40218100e989f6dff8d1bb337cee52b451554f743448f8b39c3df73066c30f0b7740303807141ff2580a0a9a5b96e3ff21 SHA512 d2d645328924c9e9eb76e267cb47a7397f5cb200ee0a1a295eac1b0da4ba87657c64a7b8f2fc8aea3a359c4f44255e8d44fc06e40c65db539f50f9738b55cb47
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916084744-dbad9cb7cb7a.zip 1487101 BLAKE2B 248836520e1dae45333b38bbdc889cf8ce136c536891ce3e819af8decba00317dda0b4e186607b25e2ad605997c1c8ee1f7535077e6f9f2e79fdb89c8fcc125b SHA512 410356c04131880f99da82743350d70fbbdcb71b85f1a96be3648eaf580942770ed2146594928e13cef46ccc9a2bfc9b125f3de2568aabea1c9610684ea16659
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201113135734-0a15ea8d9b02.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117222635-ba5294a509c7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117222635-ba5294a509c7.zip 1528596 BLAKE2B 5ddaf405d770c1952df4ee89471634ecd018fb3fa2d50853f25ed81140337aa10d2621f96116b2da6ae7015ca8f2956d21af89247ce9bb8e98d7dfa71a33a822 SHA512 838dafe6bc1e0a60d3e915e5786c972a95a9bab5f3e7cc3c8bbe918d0cb097211c297368992cabe4f255c1855e1ceceb7d038643c34f826afc520035a6a50a12
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -101,7 +86,7 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLA
 DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.mod 29 BLAKE2B 19c591a3bcec66342d2e3b47488fa4975e9b0e48628091fd8c36b77a2dfca279ca5be1d2fac9b97b8f43db6315fe24b4597ad91c4b26d963746b3022ff31e1fb SHA512 aaa83d3edd25827dc6a4f3ef13c8c726f518c91343ba85ecc09cbfbf9a318b66394506db5b72c3e9117b21b9ebc9cf81d1d6ec4cbd4246f8de32123cbea0ea24
 DIST gopkg.in%2Ftylerb%2Fis.v1%2F@v%2Fv1.1.2.zip 6816 BLAKE2B 44b63e4a425a5b52504f3fd58c5f8452a550633d79407310c27ee0ecc66c612e7011937a1e220bb67e8fbc47d2bf9d88ccdad6088d967ea541f4a7e302dbe441 SHA512 d371c8a87ec7ea2f7fc4af4818292d4882c15de1709f6d939adbf86a6a81537d066aceb0538c4fcf9849e05018755caa472be5f3e3894cdb462c9fa2ee3b0a44
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
-EBUILD croc-8.3.2.ebuild 5771 BLAKE2B a975f1a23bc6222bdae58f835dce4b919749fe0e2b902aaec18ebf88994b6e32c595d72ebfb0b251b0a268c75150b603197dd03bbde6cb3b85d926f8b311c4ba SHA512 40bd78393e802c2310a11f4516c51a03f77725db4df3a5c2f7e41323abcbad55ee86a74d1ff6058ecc9f6cbee3083c04c86a44576bcd552b9f640672250a27ab
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+EBUILD croc-8.6.6.ebuild 5424 BLAKE2B c6d3b912538b9f5bd135a959af87226a045fd2402de53310ad5d348f10e55a3e6f2a1c8ffc1e792f8daa6955746928c1d81e830a0e609234271aab50f33e405c SHA512 ee8a6cc30687121478e84d534fc23555a9ef1e3d9defc949c7d6236f714f41fdb0870897c62e62e04936cfc657ad2c9c81429ccb71954cff3ed13440b7cd7863
 MISC metadata.xml 326 BLAKE2B 1d21a0f6089d6399bf2f2262b64d941a9d8ca689929ab306121968e86ad29465d7dd6802ea8010c2bdf898f57ce5a640d74f93340058e5d155878214668ea683 SHA512 ce6f19fc8a729207e3f95787e8d4100b3877c22db06afa83667d58cd1d208b127c49bb7116280668ef0a4f864b0f92cace9aa1766efd82ed1cffd1b1fab86c91
diff --git a/net-misc/croc/croc-8.3.2.ebuild b/net-misc/croc/croc-8.6.6.ebuild
index 3fc261c88d26..05e2a8b4b366 100644
--- a/net-misc/croc/croc-8.3.2.ebuild
+++ b/net-misc/croc/croc-8.6.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit go-module systemd
+inherit bash-completion-r1 go-module systemd
 
 DESCRIPTION="Easily and securely send things from one computer to another"
 HOMEPAGE="https://github.com/schollz/croc"
@@ -23,8 +23,6 @@ EGO_SUM=(
 	"github.com/davecgh/go-spew v1.1.1/go.mod"
 	"github.com/denisbrodbeck/machineid v1.0.1"
 	"github.com/denisbrodbeck/machineid v1.0.1/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
 	"github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod"
 	"github.com/kalafut/imohash v1.0.0"
 	"github.com/kalafut/imohash v1.0.0/go.mod"
@@ -33,11 +31,6 @@ EGO_SUM=(
 	"github.com/kr/pty v1.1.1/go.mod"
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.7"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
 	"github.com/mattn/go-isatty v0.0.12"
 	"github.com/mattn/go-isatty v0.0.12/go.mod"
 	"github.com/mattn/go-runewidth v0.0.9"
@@ -48,20 +41,18 @@ EGO_SUM=(
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
 	"github.com/russross/blackfriday/v2 v2.0.1"
 	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/schollz/cli/v2 v2.2.1"
+	"github.com/schollz/cli/v2 v2.2.1/go.mod"
 	"github.com/schollz/logger v1.2.0"
 	"github.com/schollz/logger v1.2.0/go.mod"
 	"github.com/schollz/mnemonicode v1.0.1"
 	"github.com/schollz/mnemonicode v1.0.1/go.mod"
-	"github.com/schollz/pake/v2 v2.0.4"
-	"github.com/schollz/pake/v2 v2.0.4/go.mod"
-	"github.com/schollz/peerdiscovery v1.6.0"
-	"github.com/schollz/peerdiscovery v1.6.0/go.mod"
-	"github.com/schollz/progressbar/v2 v2.15.0"
-	"github.com/schollz/progressbar/v2 v2.15.0/go.mod"
-	"github.com/schollz/progressbar/v3 v3.5.1"
-	"github.com/schollz/progressbar/v3 v3.5.1/go.mod"
-	"github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9"
-	"github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9/go.mod"
+	"github.com/schollz/pake/v2 v2.0.5"
+	"github.com/schollz/pake/v2 v2.0.5/go.mod"
+	"github.com/schollz/peerdiscovery v1.6.1"
+	"github.com/schollz/peerdiscovery v1.6.1/go.mod"
+	"github.com/schollz/progressbar/v3 v3.7.1"
+	"github.com/schollz/progressbar/v3 v3.7.1/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
 	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
@@ -69,41 +60,34 @@ EGO_SUM=(
 	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
 	"github.com/stretchr/objx v0.1.0/go.mod"
 	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094"
 	"github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod"
-	"github.com/urfave/cli/v2 v2.2.0"
-	"github.com/urfave/cli/v2 v2.2.0/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
-	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9"
+	"golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200904194848-62affa334b73"
-	"golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
 	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a"
-	"golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201113135734-0a15ea8d9b02/go.mod"
+	"golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7"
+	"golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.3"
 	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4"
+	"golang.org/x/text v0.3.4/go.mod"
 	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
@@ -111,8 +95,8 @@ EGO_SUM=(
 	"gopkg.in/tylerb/is.v1 v1.1.2"
 	"gopkg.in/tylerb/is.v1 v1.1.2/go.mod"
 	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
 	)
 go-module_set_globals
 
@@ -121,10 +105,28 @@ SRC_URI="https://github.com/schollz/croc/releases/download/v${PV}/${PN}_${PV}_sr
 
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/croc
+	acct-user/croc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-disable-network-tests.patch"
+)
 
 DOCS=( README.md )
 
+src_prepare() {
+	default
+	# Replace User=nobody with User=croc
+	sed -i -e "s|\(^User=\).*|\1croc|g" croc.service || die
+	# Rename bash completion function
+	sed -i -e "s|_cli_bash_autocomplete|_croc|g" \
+		src/install/bash_autocomplete || die
+}
+
 src_compile() {
 	go build || die
 }
@@ -132,5 +134,10 @@ src_compile() {
 src_install() {
 	dobin croc
 	systemd_dounit croc.service
+	newbashcomp src/install/bash_autocomplete croc
 	einstalldocs
 }
+
+src_test() {
+	go test -work ./... || die
+}
diff --git a/net-misc/croc/files/croc-disable-network-tests.patch b/net-misc/croc/files/croc-disable-network-tests.patch
new file mode 100644
index 000000000000..92a3a620b96e
--- /dev/null
+++ b/net-misc/croc/files/croc-disable-network-tests.patch
@@ -0,0 +1,33 @@
+Disable tests that fail with network-sandbox
+
+index 101162e..5be096e 100644
+--- a/src/utils/utils_test.go
++++ b/src/utils/utils_test.go
+@@ -7,7 +7,6 @@ import (
+ 	"log"
+ 	"math/rand"
+ 	"os"
+-	"strings"
+ 	"testing"
+ 
+ 	"github.com/stretchr/testify/assert"
+@@ -169,19 +168,6 @@ func TestHashFile(t *testing.T) {
+ 	assert.Equal(t, "18c9673a4bb8325d323e7f24fda9ae1e", fmt.Sprintf("%x", hashed))
+ }
+ 
+-func TestPublicIP(t *testing.T) {
+-	ip, err := PublicIP()
+-	fmt.Println(ip)
+-	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
+-	assert.Nil(t, err)
+-}
+-
+-func TestLocalIP(t *testing.T) {
+-	ip := LocalIP()
+-	fmt.Println(ip)
+-	assert.True(t, strings.Contains(ip, ".") || strings.Contains(ip, ":"))
+-}
+-
+ func TestGetRandomName(t *testing.T) {
+ 	name := GetRandomName()
+ 	assert.NotEmpty(t, name)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 4a078afa15a5..81ddcd22000e 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,8 +4,11 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.71.0.tar.xz 2379056 BLAKE2B 50d7369e4335823c3032b8801b270f7d8e687b0552f25ed5f9752549483cf68870e0422132ecf86e756e1c7c27cdf60048a7765850608c3a1b734cffb1fe7b99 SHA512 f1ea045f23b6a7e2c84ea83954d3299c612f57c3b1e5fee0b39493dc92fc4e95e7af2a5424c2e5bc480659e80cf1adce1fc528fc816f8ff2d0e7bfcfe4c5830a
 DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 47b3a4704ae8b09b37f7a9d8850fd7d692d91db3dd4ad776aad9a57d0162e0f4091e0387a850eb048f834e6dfee5bcb36da56493a106696c72072c612b47f623 SHA512 631e0ee8562e5029fe022bfab4222836a3e6d666e82e2bfbd78311fe5985105218a36d1ea68c93472fc57a12b713957a3bcca6e385eda4e58a47ca8d5d50265b
 DIST curl-7.72.0.tar.xz 2390040 BLAKE2B 8f20efe7255ffe6d68619645b634b9cb10557ba0ca458904e99105133fb54cfafe4cafa0e7a1c5e20bbf5b5d24c8c44670cb5ddc1a2035ca43eadd24899ea953 SHA512 e5025a32eac6108ccb13d1fcce9c2de28b3a6d6e9a258a647c4be45d71718f75653e1ccd477ef5f29242a15588255c4ef43fe47bf9908b938b6769fccfaac107
+DIST curl-7.73.0.tar.xz 2394228 BLAKE2B 33ce983878dd3154d5e3e44b2b64a02e47a3faac77615db1c67cc6617495c16f40a36406e1627e2cef62bc1a01cdd0c5ae47ccc6cc4265257fc47b2f34eaac65 SHA512 95330bac2d6bc5306d47723b3c7bdb754fabe2ba2df7b2a8027453a40286f1c7caaee69333f0715e59fbc7fdf09080968ea624398c995cabf3d57493973867bd
 EBUILD curl-7.71.0.ebuild 7692 BLAKE2B a2114c226d010472ced5ed0a4d25feeba6d820defc786c49022c74dd0eb72a56015086fb549d3187dcd01f6cead02da6f9668a3442c833a6f52b8e76419d5bae SHA512 0d10f62aeb9a91c6199034060295064621ece66181019b7530b98d38bd36d31c0d404d1a92a4245cab7386363c84c6bf3c054b977ea07e3a8fb5aa541b877f28
 EBUILD curl-7.71.1-r1.ebuild 8734 BLAKE2B 748f1f1564ee84bd716679a8b336f324d325c51e74efe8db34797a9deecbc153a4158fb5c563076f5b8459798b9a3ebd4f2a6851ea71d9fa2f5da40de716d5cc SHA512 dbf4dc6fcb9ca884d36373661242558ba2240f6d9b88c1cf1a4285cebd06425d3fce7c38f52eb3b1cbf832e3cd3712d76d214824fefb6040168f9475081a00a6
 EBUILD curl-7.71.1.ebuild 7695 BLAKE2B d47481a0edef1362479059a346768e2c2ad9a9059591e8f73c69bb545cf5c825b04a7049ba36849a34dbf8ecb8d8d41fd2da8ebc5e497b9b8b8da2568abc34a7 SHA512 8a7cf22108e3bffdc3f89adcf3d292f62200e562596253c920890356ff82f697a391f17f8a18f02bda4678e224d2927b42e969887975253245af5a7d972375a2
-EBUILD curl-7.72.0.ebuild 8727 BLAKE2B da3c0ca477e9795975e943f0fbfd3bd4f8e94a166de3edfb4107a9872fdfbff8e26cc470e2c68380ab0a9c7f8a6f53b8fcae9f830e1777dd383a5c9019b737ac SHA512 23acf3454edc0267748b54498d3689163e9edc3288e9038176fd862763210ebc1fb2bb139c138170565e6c16f7e6aead92e41531b36cf2191466798cde79b062
-MISC metadata.xml 1916 BLAKE2B 8907ea9d5ded3fadb233b056b41b3daeb00bba44caa631a77fbd07215a5a9fd1bf47b4751485a59c6b41684e4b14e0abb99b5d79566e2dc8f21a3d749f0d5d20 SHA512 8e52e382804b4d2f10de345240f7cb46203e454dd3cab31ff92be3d2d9ce2d1ae8f36d95546061208205c330c58ece1d19fb08c257da683342b484b2e53f3ed1
+EBUILD curl-7.72.0-r1.ebuild 8807 BLAKE2B 812d527d58295be590bb46afa53de21e1623945f8885ba308c0421d6938d27551ec6a7ad7e1a6c0238bc46e7dd0846e1d592910394298f457d1eb0ce254710ea SHA512 c421c48d772108e62a1809ac01b5984f741c3ff5ce20c57f8f2558721a426e23bac8ea10772f18adadb7d40b40bcdab675abbcc6837315c2afd4ed47847f09a0
+EBUILD curl-7.72.0.ebuild 8725 BLAKE2B be5a57258f10186d79ca54ee4dcd1eaa2475ec35bcd5cb5120fb526b71a3cef87706cc152259ab871efaea6fe32313cdc960bcc33119bffa8009906982242405 SHA512 b52bd92c3703eaefdaee0b1fa55ae0e3bc1ca602c78cf052811c88118442f9677245f89fa839aff00c36966dcc46e29c266620f9e311c82f4ade117b0134f2ca
+EBUILD curl-7.73.0.ebuild 8865 BLAKE2B fcad66ef5b64d166dc3a10eff742d97a4f33cb4da004f922df8b21db55aec687450c7c92cbe3374d76637aa3671257145aa6f9610ede9fd0896be5fa431011d4 SHA512 c1ad8d29b8f692d17ed455b822a8efbd7a848d798209dd155fbec1753ba72aa64ec7480d270afcedc0b018531af0e4a253e4fe78b9f50739422d6ad9abfe0e12
+MISC metadata.xml 1967 BLAKE2B ff6f524ed3c1865cfde9d3859ae4de39040a0218bd0222ec9d7e9bc58b2e1166bc3f424c47287a20bb474638d19c2b5e15092d80b1b8088cc23f2cb5e3a900ad SHA512 556278cde5d59379985db113f33fb3f20370080cb2ae387d186cd5547380df2014632f37b2df0f153c810dfa4b5c3bd383b73158fd466cfab363bb68fecd0c37
diff --git a/net-misc/curl/curl-7.72.0-r1.ebuild b/net-misc/curl/curl-7.72.0-r1.ebuild
new file mode 100644
index 000000000000..f1b9dbd3d191
--- /dev/null
+++ b/net-misc/curl/curl-7.72.0-r1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] )
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use winssl || use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_libressl; then
+			einfo "Default SSL provided by LibreSSL"
+			myconf+=( --with-default-ssl-backend=openssl )  # NOTE THE HACK HERE
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_winssl; then
+			einfo "Default SSL provided by Windows"
+			myconf+=( --with-default-ssl-backend=winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable alt-svc) \
+		--enable-crypto-auth \
+		--enable-dict \
+		--disable-esni \
+		--enable-file \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		--enable-http \
+		$(use_enable imap) \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-mqtt \
+		--disable-ntlm-wb \
+		$(use_enable pop3) \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		$(use_enable smtp) \
+		$(use_enable telnet) \
+		$(use_enable tftp) \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-bearssl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		--without-libpsl \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		$(use_with zstd) \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/curl-7.72.0.ebuild b/net-misc/curl/curl-7.72.0.ebuild
index 6d3d4ec616b6..c2870a90b659 100644
--- a/net-misc/curl/curl-7.72.0.ebuild
+++ b/net-misc/curl/curl-7.72.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 LICENSE="curl"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/curl/curl-7.73.0.ebuild b/net-misc/curl/curl-7.73.0.ebuild
new file mode 100644
index 000000000000..44c0b9c78f0a
--- /dev/null
+++ b/net-misc/curl/curl-7.73.0.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
+
+LICENSE="curl"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns alt-svc brotli +ftp gnutls gopher +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}] )
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one default ssl provider can be enabled
+REQUIRED_USE="
+	winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS.md docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		fi
+		if use openssl || use curl_ssl_openssl || use curl_ssl_libressl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use winssl || use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_libressl; then
+			einfo "Default SSL provided by LibreSSL"
+			myconf+=( --with-default-ssl-backend=openssl )  # NOTE THE HACK HERE
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_winssl; then
+			einfo "Default SSL provided by Windows"
+			myconf+=( --with-default-ssl-backend=winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable alt-svc) \
+		--enable-crypto-auth \
+		--enable-dict \
+		--disable-ech \
+		--enable-file \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
+		--enable-http \
+		$(use_enable imap) \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-mqtt \
+		--disable-ntlm-wb \
+		$(use_enable pop3) \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		$(use_enable smtp) \
+		$(use_enable telnet) \
+		$(use_enable tftp) \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--disable-get-easy-options \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		--disable-socketpair \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-bearssl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		--without-libpsl \
+		$(use_with nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		$(use_with zstd) \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index a11184c0ca04..27424bfe2249 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -28,6 +28,7 @@
 		<flag name="telnet">Enable Telnet protocol support</flag>
 		<flag name="tftp">Enable TFTP support</flag>
 		<flag name="winssl">Enable winssl ssl backend</flag>
+		<flag name="zstd">Enable zstd compression</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:curl:curl</remote-id>
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index ffb94de365dc..3330cb7582e3 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -10,11 +10,12 @@ AUX dhcp-4.3.6-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db87
 AUX dhcp-4.4.0-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
 AUX dhcp-4.4.0-bind-disable.patch 774 BLAKE2B 32f09258aeaa3aa299de1f53008cfb4d4e6d994ee2034904bd7ab80d85189a2179e05acdcf43746349b9906df67c1a967c6371f49a07f1f01c892706c0db5160 SHA512 dee1b6dd62528c8c761fea4a61ddf0057a2f594746bf698b2cc31c5de211614c5b8cb5bab69190f0bdad4d1ec781946e91889fb5fa85ca7370d4357cb9d92dd5
 AUX dhcp-4.4.2-fno-common.patch 876 BLAKE2B 004abacf9f6167440b762fd69bcd821df6531cc1d74514841cbc88abdef5f21a51d1907cbb1424eb787fc37d8d869344f9f43dbe908e3fa28d8836d898b6efff SHA512 1a0e0c57bc08e9746e372733fff3a726d99064cde800fc921cbaab0eb19d32bf8cd813d197fd0d64b6d8f4e18c4557d0ef2e81334077d363b995012301bbe176
+AUX dhcp-4.4.2-variable-name.patch 699 BLAKE2B fd0ba7636ccd09e171bfbd6efd061335f56ea6f670c1ac3b87bd73d81938862ca065358777c05f3e5a23a8fff3d0257709fce113904afb12009da43e2908f6e2 SHA512 fccc8ab1f48756dfebec0a90ac414731cdb7f2c08e6356c5ad8b7d04f2459d94dc80692d49b304efba17beb6e2585d4250d53b3a3aee6826a934a111ee391c0a
 AUX dhcpd.conf2 1068 BLAKE2B abbe4f73517fba252398da00b9aa801d0ea411ac639b219cad4a64700b74cc14322af131e0053af948f1f1b35c5a3556af75092ea5565e01d7c0d1a602ea7c40 SHA512 7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d
 AUX dhcpd.init5 2882 BLAKE2B 9ce56c4aef62641508b8f4d366672725dd277c18846f9a001de8d244ca03720aba2c52ca7bd34ac63b08db082489d915c23bd1c685c37699034373bde1a7c37f SHA512 0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1
 AUX dhcpd.tmpfiles 75 BLAKE2B 8e4ddbccb162c620df175dbb39621659f9905c54ba2dc46d3863438e030dee3a04bb4b528bb7ee91a1cb47564081e48ac6937a6aee4ea026adcdb1887e643152 SHA512 0c34ab0ef8618e6792ba8bda797877ce2e6c4fa433b4944dbc03cc4fc69efe26ce4b5e4dec661fbb2b7ae4173d908de02f4e86f8539364789a23f36cfd8edacb
-AUX dhcpd4.service 264 BLAKE2B 457cd044d41413ed0dd19e904489da8db1bf586124e9d89e45511c03485f55d0d06fdda3d6f40e22a9062f258c239979e7b40d0ead1e3b61e060f287b8715897 SHA512 e340311fb890c5fc2f5836cc8d10ea3e4bb34bb5e96e7231798e7d960f05886478bf28305828fbd851080baadafe7d3fd2c7f30a81dcbc68d6368e8b4bd0de71
-AUX dhcpd6.service 270 BLAKE2B ceea24b0a5ee307fe32ca285d805672337c2e86c1c30cef694be193349218890b6231f67267d041f8b004210880ece4b8db1663499545adddf2557d64fde4994 SHA512 2898f0dfa56ecb590c25a1f0e44446a83d1d9118e691c9a7680250a9e47f4dec2b36195dbda8259292d93a31bf0e1230b9f39ad93f2b0a9280e8cc4d77b50bae
+AUX dhcpd4.service 320 BLAKE2B db6ae11706e4201d1f5896ad7594551dae759be1625652a698833cc29e9121b479b7d0a5f7127eada6c8774d8e6d3ff55485f8487e8f5fc120a1b722d70a1a27 SHA512 58ba2c3cb0ac1265d501ceb13cf2bb13eace39929f4f31edb62d6998e1d850490d6b634fff60dabbe8e6940d69958398dc2f6e78fe5158d8021dc8b805c2639e
+AUX dhcpd6.service 326 BLAKE2B d25b992eb7c4eb50984aff7c4c8a247ab55cd201d9002b65a64ac05d311811b876383a1672f8b9e5d297a8e0986a2b6e21eabb7c680ce0ee8faac5693e7da0dc SHA512 8ae33e59f595f86c9f085e60e86ba97dfc991aaa52f922e5c32f46fbba303ae5368d030e42af3cc26fbe986050d8c6275099d5e34f9f46f6d2da9fb4c3eb5ed7
 AUX dhcrelay.conf 547 BLAKE2B 62a2a4da94dd8c31176de43d8c7c7bb0f467216152bd40330eea8f70848b5c7b2937eebcc9763a737efca0357bb5327a382de8e62cc2e7a53de0b0d850027238 SHA512 af94d679c5b7652a770d4acb96f5f12fd9dc99f4e8e26b10fab67514693f63392bc8033a6e5e6c1967d7004decc72b810462e1fe92c1d4808606e48086dea00b
 AUX dhcrelay.init3 701 BLAKE2B b77247ff4bd11d0d61e99b2c759e85889cb50bcc479de2b4e73764809f395168e6d614cba451bddfc614bb6d10a6ed2f9a23f9baeb27b32ff7b55304265e7358 SHA512 ab4c38c53bf21dccee252358f0ecece81829048a546f380cb1e3552804e412c38dac09805fb7f9520531d48d3d79b3dd228ffdba7203b89ac30a778a579ddbda
 AUX dhcrelay4.service 202 BLAKE2B 2adb2a349e63e449cce4c20c6ea1217f2321f3e78e3555fead92f0c7497c90bd9c85e9ce6a1236500aaca446211b733f17c8a8316dd38df71edbd117355b2022 SHA512 fcc41f7bc055a3f32f288536d93447c1d0b9f112196a3864e12668a9c844d60f99f01f991846196ec53034d65da076276fa633069308b8f674e9a2af20e107e4
@@ -25,6 +26,6 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
 DIST dhcp-4.4.2.tar.gz 9906235 BLAKE2B b2233aafdefebc2d907dc83acbefc8df8aeb35791261343e2880168a59056d4b92ef030745fac16dd9a0c2f088d90cf8d420b1c2a7b0fc53d5ed11cffd4b8f18 SHA512 c3dee2cf6e4b43d519d4bc89e9b8b12a6e3747d8c4edc0f83d4a88355a483b91a5f7d2353a3c0a2f37f88704fd2f64478ac5161ca72b10c42cebcb92907afa40
 EBUILD dhcp-4.4.1.ebuild 7902 BLAKE2B 06574b801312668a19d8a8f55611c816c29507c3ad0dc187a1e35aa2bf6aeda7d1eda3bdda6e66943c627b7a7fc473c2772aee55ec3e33912ea8dde3bce2495d SHA512 b44efc8e344f8c08728fb92bd0550a4194e23c3277b46f8ecbb28c56cd62bc38eb908764eb3fb85b3f7ba84f21507710a81e6eff1c759a00765ef9bdea824cb7
-EBUILD dhcp-4.4.2-r2.ebuild 8035 BLAKE2B 9ee23fa63735e0e20de2901fb3b21a7e5669e2f8c314e1dbdc31f0e8e10ee024baeefb7f44c1c2ffa9a0dfd4d64b1f19dfff745d076d953c55fa64b1a4227045 SHA512 eab39eeac589a57a52bc7220fe79a9b84fd9c7ce8e489eeda4a1c7a9f8b3f685c8fa15856dfd1c1b70e502589c98b3bcfd820cd4727800e6898a6bfe56c3b5a0
+EBUILD dhcp-4.4.2-r3.ebuild 8089 BLAKE2B e186ca46c3785a5046f7598289a7fbf16a4a6fe659c73ae9fc1f1b2b7a73a119421da5d211766d107aa5a3ba74437b82d5941a208d6eb2e293d559404a2124f1 SHA512 338c64b3baa5d4c244064cf1dad7bae7de87578b3e0adf173ffffae0e8542e123476ba8fe979fbdad6d9867137e8961fb72a4438038c04961a1c44584ed39fd6
 EBUILD dhcp-4.4.2.ebuild 7930 BLAKE2B e4a9d780010707cf9f16816f29ccd1a9c0ebbf961bd89e6c05a1516a5a97c6900a3a04e6435ed4bd00bc8874dd126d6e87d95e1147933f72b1ae8deac2acc6dc SHA512 40b769fce9749bace22ebdabeabfaf44251b03a07bb8dd186c8af5238d1cbdd89a40e59205fac287f576b2fe5d2152371e7f1244c5d22daa2cf158d0814bc9df
 MISC metadata.xml 476 BLAKE2B e77eff7eca45c59f3f7ead1b4065db2696400ed0814fddcd6b8cd377d156795e7d7a6864da8c869b870d1705bbdd6f403a3a0358e149b5a4b4ad098589ba90a9 SHA512 8e9599bcb9c15749514d5fada7ebb4e4bf0752541ff8b54a3c6b557d5debc6356ce593b8f9640abf534aae123d3e65d978cfdf091635246c8afe2a170a61de26
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
index 0257824a08f6..6cad24e75195 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 
 	# Possible upstream candidates
 	"${FILESDIR}/${PN}-4.4.2-fno-common.patch" #710194
+	"${FILESDIR}/dhcp-4.4.2-variable-name.patch" #752402
 )
 
 src_prepare() {
diff --git a/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
new file mode 100644
index 000000000000..9f5085dd5e23
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.4.2-variable-name.patch
@@ -0,0 +1,25 @@
+From 261c84d91d1b4581df9f7f0ec031908299de7726 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 19 Dec 2019 09:27:44 +1100
+Subject: [PATCH] fix variable name in conditional block
+
+---
+ lib/isc/stats.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/isc/stats.c b/lib/isc/stats.c
+index 5bce3c1100..a7ab97ce53 100644
+--- a/bind/bind-9.11.14/lib/isc/stats.c
++++ b/bind/bind-9.11.14/lib/isc/stats.c
+@@ -297,7 +297,7 @@ setcounter(isc_stats_t *stats,
+ 	isc_atomic_store((int32_t *)&stats->counters[counter].lo,
+ 			 (uint32_t)(value & 0xffffffff));
+ # else
+-	stats->counters[counter] = val;
++	stats->counters[counter] = value;
+ # endif
+ #endif
+ }
+-- 
+GitLab
+
diff --git a/net-misc/dhcp/files/dhcpd4.service b/net-misc/dhcp/files/dhcpd4.service
index b064bd9b57df..8197ace12103 100644
--- a/net-misc/dhcp/files/dhcpd4.service
+++ b/net-misc/dhcp/files/dhcpd4.service
@@ -3,6 +3,8 @@ Description=DHCPv4 Server Daemon
 Documentation=man:dhcpd(8) man:dhcpd.conf(5)
 After=network.target
 After=time-sync.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid
diff --git a/net-misc/dhcp/files/dhcpd6.service b/net-misc/dhcp/files/dhcpd6.service
index 603cacd8eb89..7f41db0a72b1 100644
--- a/net-misc/dhcp/files/dhcpd6.service
+++ b/net-misc/dhcp/files/dhcpd6.service
@@ -3,6 +3,8 @@ Description=DHCPv6 Server Daemon
 Documentation=man:dhcpd(8) man:dhcpd.conf(5)
 After=network.target
 After=time-sync.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/sbin/dhcpd -f -s -6 -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index f40008cbc88b..2ac1313f9700 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -3,10 +3,10 @@ AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8
 AUX dhcpcd.service 308 BLAKE2B b9533183aedeb8243512923de5eab61b8655bbd907d89cd06d1fac13c4b1a7741b59e9eebd37abfcfd2092781ba29e43edd4fa09d4eefc5b54c62ea74aa3885e SHA512 ff512117941a285e0b6f90689a78d6149d134d457ab08be78cd741f2c3707eb0c21ddf5961d8d5972844a13e995bb1757a29b9d0e6b26c6761250c8f9da29557
 AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
 DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da65021b2c1261a45958b628cd066ccd9bc6b60bbb42f8280fcbbf9d4b1c7666b993c37f150b27ef2a0527a0fd5b96 SHA512 40ac106ffca60b32362aacdfae0fa3a2993a3eed72bf452322412a912f594aaade1c24b862233455033158a6e453ec75d6d14fa52df6b4c5ae435dd6ceb29f2a
-DIST dhcpcd-9.1.4.tar.xz 249648 BLAKE2B ed4162df1d614c1bdc1ef5e22cd36d22434ed118ce4e72dd84cb3df63947eceb3e86bfeb2cbb7f8c12d0ed75e3629d9d49300927065b877d9684decb0289b97d SHA512 ef043dbd45cb6e5cfb407d9835e5fcd4580c4341e37170f2ff26869badf6ae030c477acca15163753e708ae8cadd62fa7d277c8542984b9119b851ed25a3149a
-DIST dhcpcd-9.2.0.tar.xz 250584 BLAKE2B 38639358b15fbe179ee4a233c28705c62fcc3ce9ab7faafcce72a85238580c3773ac472572277138eb66df80b930875bc37bb5c1dfda38a05d381ff98ebf6712 SHA512 deade0f650445a86de34fa4b354ca7da11ed0be38d07e412b5602c45ac40149d6a2925980b66ff95c625184c981b02864a95ce5c3c01245bb48cd1a21d2f5aba
+DIST dhcpcd-9.3.2.tar.xz 254476 BLAKE2B 86cbb02564474e8ec6809315db10ec06c072ab3e4a563b2a0f1df21d1c02ed3a97b816ed190803910f0cfe39de6420b82cc37ff81e29b67806b250c877b0db34 SHA512 f7e5b060e8b5cd65e6d1660a79d444e066dd8a6c492cc44b9522577687a93d944227ad3ff840ac0f65a9aa725ca1a79a7178330d8445b808409e215ba7f042b0
+DIST dhcpcd-9.3.3.tar.xz 254972 BLAKE2B 6f808d08059ca93fd2af14b9b6efbcece08634a72c8f06bb31a49ee5c6a7f52af6bfeb43e007710b466bd70d4005416d7882fc93ac5b28e1a019f06b9b0afe15 SHA512 1ff58107fe7e45a42c8da32ce6554244c1cac289e0c207f7dd29f5fcab1a2aadd66434604cd35e979e0aa138de9d968e9360b5339d3f233e6c1a83d7a20799c4
 EBUILD dhcpcd-8.1.9.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
-EBUILD dhcpcd-9.1.4.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
-EBUILD dhcpcd-9.2.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
+EBUILD dhcpcd-9.3.2.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
+EBUILD dhcpcd-9.3.3.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 MISC metadata.xml 646 BLAKE2B 80de0aeee2dbf33f6bebf9a64be5b13a8eb078e7693157ede4e31bc2ab86b9588b40949af7c9dc511e679202640a7c053689a5c562dadcedf9216d9dce25b1e6 SHA512 5917c153c5fa048bdca17cbcd0b5ce81a152635de166fa140ced7e46bffacc9e2335092d8c4454fd33515a8d28cb8b1f114dcef8465526837477a90dd20e980d
diff --git a/net-misc/dhcpcd/dhcpcd-9.1.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.2.ebuild
index 092c6e4a1dda..092c6e4a1dda 100644
--- a/net-misc/dhcpcd/dhcpcd-9.1.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.2.ebuild
diff --git a/net-misc/dhcpcd/dhcpcd-9.2.0.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.3.ebuild
index 092c6e4a1dda..092c6e4a1dda 100644
--- a/net-misc/dhcpcd/dhcpcd-9.2.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.3.ebuild
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index b45608fb93c3..04f651c870e6 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,16 +1,10 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-104.4.175.tar.gz 96650490 BLAKE2B 4a74e3b8b31ba720ade57b685978c19827e53dc2eaf4519e10f736121c08e61de66caf1211568c52f624fb020ed8ba5c69c2dbf053bffa9e95d6c9308214d87d SHA512 30dbaa4061f673137f4659f201b62cabff94c827175d00fc348140926a9afe6f693e17237642988ccbe27988eb0aba516705cca65340d59d1d1889784660901c
-DIST dropbox-lnx.x86-105.4.649.tar.gz 96974503 BLAKE2B b14cd6891afcd7858ae7564e4f49753a60a70caef6f0c7ff56ecfef54bf1cfee629fd99f069679d210a3e16f48ab0387ca78bf49f92b2fce40ba4cdb0ec147df SHA512 5dfebc03d76465bc6a6cfd9fdb551385e0fa0b50908c8f2fab90a200815a8c5d90b2294cd8d8ff00284668b4d3e09aba031d124680b6780f5269224ee2e25376
-DIST dropbox-lnx.x86-105.4.651.tar.gz 96975853 BLAKE2B 63c37c22475127d06e5cabd9234818d5a54ca6ebb76b8e53616bc6642b6d9045ad1c0b4cbb364b181b2ccbfc4f6905fe39ce2092cb97978288c6c7e5ee9db771 SHA512 e6c4d02c268753b06613206086f9b4a1ff10202a7bca914a071921407fbd276f6a21352d9b43861966fdafd7dc08181bb0654575fcd0c5b344bd2e8f16ab9a47
-DIST dropbox-lnx.x86-106.4.368.tar.gz 97028969 BLAKE2B 915bd80dd3c09cef04fe1d2099975f8d5852fa058925803081ce38741965e4abeb94b9baa941904294970e224830b48934619b3ad7c01966d97b92154b7e12eb SHA512 c1755b919893ff337defd67e453c2550900d9f0d0585ee96871ce03c8dd07d6682da17f2be4a80978c282778a79cd8b1d8e49abce51f0ae7ede522edbf8a3fd8
-DIST dropbox-lnx.x86_64-104.4.175.tar.gz 100702526 BLAKE2B 49d89293ce5874a01fba14204acfd1234de87b4c5e3f5dfa93cd4041f9412e0801a3e232869e376e583d46d56ea9c7635ec756f005903786dffce1caba608350 SHA512 74e4061ac00881fee06ab7f978c27a2fd0e782db7efa63d10ed7c5ce28a679fe23084521d46f819cfc2a691df6e5aad1bd6706d3c2d604d4addd50ddb99e1b3d
-DIST dropbox-lnx.x86_64-105.4.649.tar.gz 101001350 BLAKE2B e6aeef5bf38649fca5fba35a88080e905a2d16276927bf9ae5952fbc79e32fe7aac5552b7a53fe3cc59170d0af711f2c9c412da8a4539f7bedea6cea47986b03 SHA512 b6f3e766ee9e2b138624bab5ffed9365163b8d33017cce27c9e0beab2b2f500288e6283c59da8a96421daca36b1c6e46925658b6ffab1fdde43efc92ccf1ce18
-DIST dropbox-lnx.x86_64-105.4.651.tar.gz 101001773 BLAKE2B 9cb07111fceec62b34faa7f9b258e9c60f63c7d3828986f9fe06e27c9df24da00d77ec61eed0318c33453a7a4254e89946504deb8e9c1078204a508c2e9ac7df SHA512 8ffdb4682950a643d3230ae07c73a2b6e862051d700af021cb14152b681c7d01164e821b2fd59978612aaf12843084912aae9d0a6fa127d2fcc01e49908a1c5b
-DIST dropbox-lnx.x86_64-106.4.368.tar.gz 101043233 BLAKE2B 781beb485914fd73d63ad5c909e43dc4ee24c13674c069ea51251ec0d63f731b13e4199c0cb1e536e485170375ec77664adf1ab11999f04fb1a9d864b7e5447c SHA512 08ce3b7e13d8ecd26212fc533d23e900b635a834fe4550dcdc50fc6a7852f0f372e6dd797b1f9553fb73545a78567ed60b8c503d50db00574a9729db3a8565be
-EBUILD dropbox-104.4.175.ebuild 2611 BLAKE2B bf627000c6058defb57ece27ca2ff7a496b98942a896c39d8fa8064c916052d4692c6c9d7ff82ebfea4964ee34ade283a6454d918f906d27a1a80b1c8b6daf6f SHA512 16776b54f81559f301424df3a1c6f8f5526422e07857ce8acf62e1d4be2195532190e69f734c673539762ef25d4077f90b1223f640616fcba52552509300aeb1
-EBUILD dropbox-105.4.649.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
-EBUILD dropbox-105.4.651.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
-EBUILD dropbox-106.4.368.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
+DIST dropbox-lnx.x86-109.4.517.tar.gz 98336166 BLAKE2B 6c8e59b6640d83c9f4a36a700d9471b2c4b97618126b78fabccc031ee6ba2c8b94122b273d01b21d6762020aae904c284a3d335dac70259692fbd045cbc0d7b2 SHA512 308e2d837a761d8bae02ef38cc9724fc6a411b1cdbd89c2bb0e3e2b4ee512755c859579fcb8cf1ea34b1e75becbe9910f878f8b019ce3b74c59a15a92e44df4f
+DIST dropbox-lnx.x86-110.4.458.tar.gz 98543766 BLAKE2B 85c1e2d23436a8a48587a8d50a5d44c7a8f6e6de571f7a7eaa2cd54da45a7f3721f23a9ab1769353536d50c93f40d35635f228342888ba4509de9c9130d5f0a5 SHA512 e913cac34c1934818d5ac1478f3b723d34f5a196451a8b652a7bdbef552f94258b36323cd3ae77bfdb2a85caf0006b6fbf0ef6997a4d616f25c0bed18c844393
+DIST dropbox-lnx.x86_64-109.4.517.tar.gz 102381526 BLAKE2B 915d8901e88597c456d507e70ba4026cb41d110ac08a902f10a02490e272e61cc81b67f04769e44746883e1f6064eb4ee034d74aa6b4ed4e6d6ee0a7d785efb2 SHA512 502149b0d20d47ed6af3e073d2e54b3888fa093084e8c45fb5c36aef56d47a2d4280daf8dd586ad95b55db9435b45acca4b25140840a786d1c1a101011210de4
+DIST dropbox-lnx.x86_64-110.4.458.tar.gz 102601668 BLAKE2B b9614d7880dab101ff12812b78e26b269ad1e82505d4a02fc284dcf0c72256062b65bcb29598a45268b41eaa7567f6d13cfa8e264df805bbe434039852094b90 SHA512 f8107e4335adce49f3eca742b0517777aa84d35a60657c92dcf155f55fecef3bbcb01e4c1bddb43eb96568f9f296245e57e6af0c799e2cd5fd9c900bd98e0ccf
+EBUILD dropbox-109.4.517.ebuild 2617 BLAKE2B 4c3c0dff5562ba9d40f10b6b5754a5f4ee8011bc7331a0ad9e2d89997a22e00752c8a062a24a4c49404fd6b2743f814b31e792c25ecbeecd0340a4edf33ddebb SHA512 3a89190dd79b8eb50e33262c3a76fd63476c09c42cdb7026abb72e4fd1eb109c92f0f6c09903af4874cb72c271998ceb21723a6f893fb954eade67c1be860765
+EBUILD dropbox-110.4.458.ebuild 2619 BLAKE2B 0d69bf03e5039bdb5ae193deda12ab1a77c7acf20622f90075d14e61be8b019b8551ec3727cfc37b2d36fd6eb063697840b983f42b3b03fe5efc5b87d61f0cd0 SHA512 aad780d3b5e3daac4126915cd1622025d1734dc83af04f3eef8965cc2c5948298e3c9fbb0dd173d846424a8a09d490150a6f5b69c0e23116fba6513854563bb5
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-104.4.175.ebuild b/net-misc/dropbox/dropbox-104.4.175.ebuild
deleted file mode 100644
index 2408606d15fa..000000000000
--- a/net-misc/dropbox/dropbox-104.4.175.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/libffi-compat:6
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-106.4.368.ebuild b/net-misc/dropbox/dropbox-106.4.368.ebuild
deleted file mode 100644
index 7286be94a2dc..000000000000
--- a/net-misc/dropbox/dropbox-106.4.368.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-105.4.651.ebuild b/net-misc/dropbox/dropbox-109.4.517.ebuild
index 7286be94a2dc..c4fb56f770ad 100644
--- a/net-misc/dropbox/dropbox-105.4.651.ebuild
+++ b/net-misc/dropbox/dropbox-109.4.517.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="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/dropbox/dropbox-105.4.649.ebuild b/net-misc/dropbox/dropbox-110.4.458.ebuild
index 7286be94a2dc..7286be94a2dc 100644
--- a/net-misc/dropbox/dropbox-105.4.649.ebuild
+++ b/net-misc/dropbox/dropbox-110.4.458.ebuild
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6121e0bbf7bc..76fd417b780b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,9 +1,7 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
-DIST electrum-4.0.2.gh.tar.gz 4395620 BLAKE2B 27d5e74ea85d792f73a01d41528dc9a84af374d672e7c7101a82e18634a32d7ebdb039571bde36625b460c6c7634ec75848711dc4cabfbd1be46f16d18e35df2 SHA512 8b03d60cb549315c9f8a2cb4f02e3a483b8e8f9ee0461bb9d54acca0d9cf96d38a158bb6bccdb1bb584fd5a3f4fd8ffbcb0d45244f41dc5636689adb514f1681
-DIST electrum-4.0.3.gh.tar.gz 4408020 BLAKE2B ba28765683739dbdd865ad9ed034c7dd7c4f738fdc13fbb1b0c0312785d89a65c0252354fa6064d9964207ebef841dbbeb324966ad2d0b8ec26d693456d4a082 SHA512 4295a7ebb16d1809ca892a736a01e62722d3b44164b3acda4bd4cd5935dfa8c77106ddb9e32434db057d90d015d786b667949fe17d0ebba70cf6c13be13cf2ba
-EBUILD electrum-3.3.8.ebuild 1982 BLAKE2B c1db2a13135b445b0ffd37779025868fc2446039a527988052d10dd48e0e5fff86e0e04f6373ff4d12a3e0946493c1496677404e8b35643a1847da149cf2db9d SHA512 9f9844b2ca4b8a76d3de83684860c9f840d4da10787478c579d3cebc1d026c8d4989ec0ce8de0a976d46771597723653485604d4eb85427987cba2c3364f3e61
-EBUILD electrum-4.0.2.ebuild 2400 BLAKE2B 793cf0cb19ac8e0b2a75dc3563580a144fd6364104687d74980daa1caf5478041223494f8318939130e0f1f19984977e9b78c5617400c1716f3655c3f4a71c43 SHA512 0b7e7fd953a9823299667c8931792e9ef4ff814bc6fd0bf5da48ae1f99ab7d62a4e9f79ac27942f988a05a8c3b9c0ef00dd32182cb0b2fe27803e03f359f5c74
-EBUILD electrum-4.0.3-r1.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
-MISC metadata.xml 629 BLAKE2B f1a4cf6cae2c3471b946b9a2966b0b3c8e7c2d39ce124fc100142b5d79d27377939094bb5b3ae9a7ff6c947b93ce12a38e3075e77110f1cad9a246e03159fed6 SHA512 c8e37976ca6a16a8d7f2326ff6d276814b5c4f5b7c1f39becb7a800f10b0c6aa7333d15f0d208a1ffd592b46db887dc77e95ffb5d1e01eea1ebfe6c478c8dfc6
+DIST electrum-4.0.4.gh.tar.gz 4415688 BLAKE2B 1811b3a5534c343b6bc1efccfab822e2550e0b19563837ee69d93006c081acb116b96a2bfe812420cfd7694190d66eb5e5bb01e5d0271262b714a06979ff053e SHA512 1b4fc9f0ac9624ac271ba65989524f902a465ae50465fd7e9f90366a59e17e6938ab0f58cf9ec8e40c10ee99074e1f800cae080d37da60359091be698957ecda
+DIST electrum-4.0.5.gh.tar.gz 4429965 BLAKE2B 1aad8c0407f1dbe085f7cef580785335823fc773296c040a7ce118b0e3edd4a1972ad0712b98754cc548df841fda6df0c854797557c2a2f57a37bd4f3cc2cdb8 SHA512 a0f2eeb57020dc16b568a4d4fce37522f212036455b4e79abf1d44bc20065e896a861bf1a5547fbcae87c2659720d7937c9c0c817e787209c119a06c05549e76
+EBUILD electrum-4.0.4.ebuild 2400 BLAKE2B c579900e61c708b2f721fde772889488f0b43579517c34b21d24c1d665b1d7097a4cf367a52ea561bcd3856c2b7565dbd3c9044a3454ca04a3c1d5e198e94d38 SHA512 c45735ed759d721775892f5126a11038a7df85e616259c5627e6bade3654d85f1396bada52a240d1a02509ddfaa2b3711f0c4ad1c62b7c4e25b980dfb04f51d3
+EBUILD electrum-4.0.5.ebuild 2402 BLAKE2B 0049acbc9a0a618dfc2d9be7e7cd637bbf020e19f161e2235b17514f19e43f2f9ed7e29f65c93f946f4a4b14c5523ee417149b25b1fd09871d537b13caedd31b SHA512 c42acd9643cd26b9fcc32a880e7e8db211ced5b3bba22e7708bc7a0c019b6cdf88eaa4b9759b137365b39bad2e003403da46b92e6b839c1b020c7eb978ab38e2
+MISC metadata.xml 653 BLAKE2B f58eed53ddc5608c39d763bef2b9543ce30c65a97afe157b84522b1367d19594855c5f8e39424af90c88934938601d98c5877f7d1d081aa5cc5be45cf19044a2 SHA512 a2d76c85cf2e409a1b0aa6449e43e82f1d88a4d7fa72c6282c7f7e55819d13b04dc733e3b297635aca1cb65136822b447feedf76358b948738489f8e0de97ea6
diff --git a/net-misc/electrum/electrum-3.3.8.ebuild b/net-misc/electrum/electrum-3.3.8.ebuild
deleted file mode 100644
index 21549110f526..000000000000
--- a/net-misc/electrum/electrum-3.3.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.0.2.ebuild b/net-misc/electrum/electrum-4.0.4.ebuild
index cad41a9dfc26..0c777f8eb2a7 100644
--- a/net-misc/electrum/electrum-4.0.2.ebuild
+++ b/net-misc/electrum/electrum-4.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 xdg-utils
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
@@ -29,7 +29,6 @@ RDEPEND="${PYTHON_DEPS}
 	<dev-python/dnspython-2[${PYTHON_USEDEP}]
 	>=dev-python/ecdsa-0.14[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
 	dev-python/qrcode[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
@@ -49,6 +48,7 @@ RDEPEND="${PYTHON_DEPS}
 BDEPEND="
 	test? (
 		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/pyaes[${PYTHON_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	)
 "
diff --git a/net-misc/electrum/electrum-4.0.3-r1.ebuild b/net-misc/electrum/electrum-4.0.5.ebuild
index 0ed6a75d3617..0ed6a75d3617 100644
--- a/net-misc/electrum/electrum-4.0.3-r1.ebuild
+++ b/net-misc/electrum/electrum-4.0.5.ebuild
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index f341e55ffeb6..fdc8f0ebe23a 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -13,6 +13,7 @@
 		<email>luke-jr+gentoobugs@utopios.org</email>
 		<name>Luke Dashjr</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index e106e58f94f5..9d896fddbf5f 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,8 +1,9 @@
+AUX exabgp-4.2.10-ip-path.patch 794 BLAKE2B 54a55550f928eaa3c3a64e3c7e19acff21b71753255f6c3abfede6e2f3446417e7e99413d82d12e03fcc292802ec76ccf6e572c0af081c46351b7d15ebcd5970 SHA512 71568d0d6b11f427d795e3a47e7877fd7ea5c5708d49e51958ee5077758a5ca2af0272d8143a3cca506f07e010cf4e8875403dce1d8d366a171c2c9eb1c7ef6c
 AUX exabgp-4.2.7-paths.patch 302 BLAKE2B 52110fefb75e0a36452ea3e53f099897b30df8287d033b353f66df25cf75c4a75a80e91ef49a47c652a46274faabfcf5385653ae03eb75ed1afd866c068967c7 SHA512 678258e4848b17b9880849cb8d105ee64b4cb6bdd678c3c96707467a2bae51c30d34b8609bf5c9a48bcd0722f6247b009dc5c406a3bab02d77bf2f919e7f4fbc
 AUX exabgp.confd 183 BLAKE2B 59338bbd61001e4418b970abc45786004b833f80576117122fec99f148c1bab3bc7feed80c46b8bac2ac639b720daa320bd141f65b25a37a6ce1f229653f3741 SHA512 7b888ea5053ebb8da9acbd4a85b6a9900663cadb89258aea86d47cade505e8bbfc6e741fed599d410480467f76f759175d710c284bc6caafdabb4a61c53611ac
 AUX exabgp.initd 1472 BLAKE2B 488c1de5222be9f5f67e279fa9607c326922d80c2aafa6cb098f5f721ef1df30f1d56a2a0a0ef6ca376cdb00f65cb1fc644214248b7ea9dbc9dfd55442be7d2b SHA512 453ab87961b4647374af62a02280e750ba0b1bf535a5e92c4434c4ff6c0a55f7ec52a5e0e5a784a31695e02ece42543260186aa25c658368331c06c12794d4b4
 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
-DIST exabgp-4.2.7.tar.gz 2931058 BLAKE2B 2c7bf175322a36c800a8a5874b699b01f4c3d4a8712b1f8decb73665cd214c25ccf657909cfef74610e6a5fd1903245bc4da638ac9245b04c6e63d8247d72d50 SHA512 9c53b78e3fc5ff9cef4d267e2cb3509dbcfdd4a3b21d2c7e40a8d873a9ac586b8d5bf860699b6f878cc221af341df140acdf88aaa26a79b0e7865ce7cc607e01
-EBUILD exabgp-4.2.7-r3.ebuild 1225 BLAKE2B 056734c689ddd191bf4227f71f8af8221b19bb176feb233ea1f8c6515886b9088c8b16c3cb2657a7e6ad4fac627282f349ac20b560fb9671eb6de7f770b44842 SHA512 5204bbdb48d313bae38e74fca9ddf48f1d2e57e7eaabd18943f13abedc4961c2b2ca1ef8335f5b38664aa8bf4910bf7c18c1c28d2827a323c06a403b6e500c1c
+DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
+EBUILD exabgp-4.2.11-r1.ebuild 1250 BLAKE2B 487239a380451c6449514e6e69c84b17f06ca78469e784d19eb4f5b5fe525734246b7e5d547147741e7334da6c77756e1f407068db8a2b3a991ffc094ef22b76 SHA512 38dc1b8d68f86a54e2002fe55150d1f5212b9ecb140688cf17e8505a87b7372b3a013cd42e9c9915224d3123f80f0c54c6aa664fd396859a5ef79ef1ca493d0e
 MISC metadata.xml 343 BLAKE2B 306f12e34e1edf8060cdd1515f77040a2b400a9d853b8b46a73b219464947cf3fc1f64efc32bde26074aa61cb483466ea752481876a02cb14c8388787105e61f SHA512 9c4c8e26eb586fa1153b1f02db408cebd9a460c6ceca049fe121977d1a14ec130d9289aca2f0cffee009a5e7f314818eb37b55790c75502817bb2941be7352f6
diff --git a/net-misc/exabgp/exabgp-4.2.7-r3.ebuild b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
index bdcff317c204..e3f3362cd862 100644
--- a/net-misc/exabgp/exabgp-4.2.7-r3.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit tmpfiles systemd distutils-r1
 
@@ -19,7 +19,6 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	acct-group/exabgp
 	acct-user/exabgp
-	dev-python/ipaddr[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -31,6 +30,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/exabgp-4.2.7-paths.patch"
+	"${FILESDIR}/exabgp-4.2.10-ip-path.patch"
 )
 
 python_test() {
@@ -51,4 +51,6 @@ python_install_all() {
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}
 
 	keepdir /etc/exabgp
+
+	doman doc/man/*.?
 }
diff --git a/net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch b/net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch
new file mode 100644
index 000000000000..0a86f72dd912
--- /dev/null
+++ b/net-misc/exabgp/files/exabgp-4.2.10-ip-path.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/exabgp/application/healthcheck.py b/lib/exabgp/application/healthcheck.py
+index a4f6b8d1..2b4e928e 100644
+--- a/lib/exabgp/application/healthcheck.py
++++ b/lib/exabgp/application/healthcheck.py
+@@ -184,7 +184,7 @@ def loopback_ips(label, label_only):
+         # Use "ip" (ifconfig is not able to see all addresses)
+         ipre = re.compile(r"^(?P<index>\d+):\s+(?P<name>\S+)\s+inet6?\s+" r"(?P<ip>[\da-f.:]+)/(?P<mask>\d+)\s+.*")
+         labelre = re.compile(r".*\s+lo:(?P<label>\S+).*")
+-        cmd = subprocess.Popen("/sbin/ip -o address show dev lo".split(), shell=False, stdout=subprocess.PIPE)
++        cmd = subprocess.Popen("ip -o address show dev lo".split(), shell=False, stdout=subprocess.PIPE)
+     else:
+         # Try with ifconfig
+         ipre = re.compile(
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
new file mode 100644
index 000000000000..f97b743f9294
--- /dev/null
+++ b/net-misc/gallery-dl/Manifest
@@ -0,0 +1,6 @@
+DIST gallery-dl-1.15.2.tar.gz 323739 BLAKE2B 99a06331bd7dc6ec951749129ad0ac797d9ce2d9f98e75a29198fd47d0481c43b96922ea08149abfe990e8994a19b3170853618de9b51465264d100dba777f32 SHA512 7f31c0485d9de6eaf76e7b0772e66049f9aa8fd7d77d3ef6fd2803d7ec7dddbf3419051c9d8b3984eb86a8fbbf9a168cf8ec69a55082a38e2ca23cfc3574b1f4
+DIST gallery-dl-1.15.3.tar.gz 325926 BLAKE2B 9ae31ba89a60460cd041fe9f353d4a7d1dab14fe63a8967f1a94f8d0ea42ef30032e5f734cbb370f5ac681f9274ba756a156acc7bd11ca4b5aad387fdc6be76f SHA512 618dc26ba74274c961cce1ef058fce3e12741366329ce50d09421245987a88a796be3f1a31926e8b2c33cc87cddcde3585f74f4f1a80347153c2a7a9cab7e3c0
+EBUILD gallery-dl-1.15.2-r1.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
+EBUILD gallery-dl-1.15.3.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
+EBUILD gallery-dl-9999.ebuild 1110 BLAKE2B b0bf6aa77a35b679c19734c0d2ef59c1402ad11772317efff72bcb3110a8d8e817e0df1ab59879156b9d7fe9252c7f940721915847ae2deeaf3e4eb1279652fc SHA512 ac13faf74cc15ec4456c84898ea379c3ee6a3b75a83a25c9483697f6dc7147bce66ed1ae303736a5682d3020fd27b9d165107655817bf054baae5132cc4b1bd7
+MISC metadata.xml 767 BLAKE2B 513bfe624e86287f7ba2d8fbcfd2d6e1dd66a79c9a4325a03037ff11f95c4eeae320b47f7ea09b8e6fb6643a42263556a56e02eef7ca8405541b25cc8f710837 SHA512 d5aa8f0a5bbfc2231495aa2f3dd3f6b4fe0a491b3a1d527a304a41d8d1a7f35a60fabd7283a55ff14ed30be328f557d9e0c5dd884648030a8ad5010418f08d5d
diff --git a/net-misc/gallery-dl/gallery-dl-1.15.2-r1.ebuild b/net-misc/gallery-dl/gallery-dl-1.15.2-r1.ebuild
new file mode 100644
index 000000000000..458d0edf5edc
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.15.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{7..9})
+PYTHON_REQ_USE="sqlite,ssl,xml"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# tests require network access
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+src_compile() {
+	emake data/completion/gallery-dl
+	emake data/completion/_gallery-dl
+	emake man
+	distutils-r1_src_compile
+}
+
+pkg_postinst() {
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/gallery-dl-1.15.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.15.3.ebuild
new file mode 100644
index 000000000000..458d0edf5edc
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-1.15.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{7..9})
+PYTHON_REQ_USE="sqlite,ssl,xml"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# tests require network access
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+src_compile() {
+	emake data/completion/gallery-dl
+	emake data/completion/_gallery-dl
+	emake man
+	distutils-r1_src_compile
+}
+
+pkg_postinst() {
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
new file mode 100644
index 000000000000..458d0edf5edc
--- /dev/null
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{7..9})
+PYTHON_REQ_USE="sqlite,ssl,xml"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Download image galleries and collections from several image hosting sites"
+HOMEPAGE="https://github.com/mikf/gallery-dl"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
+else
+	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# tests require network access
+RESTRICT="test"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND=">=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+src_compile() {
+	emake data/completion/gallery-dl
+	emake data/completion/_gallery-dl
+	emake man
+	distutils-r1_src_compile
+}
+
+pkg_postinst() {
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "Pixiv Ugoira to WebM conversion" media-video/ffmpeg
+	optfeature "video downloads" net-misc/youtube-dl
+}
diff --git a/net-misc/gallery-dl/metadata.xml b/net-misc/gallery-dl/metadata.xml
new file mode 100644
index 000000000000..955798794c34
--- /dev/null
+++ b/net-misc/gallery-dl/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>xgqt@protonmail.com</email>
+        <name>Maciej Barć</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">mikf/gallery-dl</remote-id>
+    </upstream>
+    <longdescription>
+        gallery-dl is a command-line program to download image-galleries and -collections from several image hosting sites.
+        It is a cross-platform tool with many configuration options and powerful filenaming capabilities.
+    </longdescription>
+</pkgmetadata>
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 21effd5a67ad..caf6a38fd3d2 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,6 +3,6 @@ AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 AUX gerbera-1.5.0-incomplete-type-iohandler.patch 801 BLAKE2B 6b0a24b74d1970c98c3b98600c491775d7c9d9c84f601f85319c53d665bad2ee7d41bfa6a933b96eb9cf6204a920ddf836447b52bbcccb4e8b857a66ac7d4481 SHA512 fdc77063b98fd0adda2d93891fa58fe54c2f96a3e8c3904ec64f6daf387169d765fb499e6cf21141b715d8597b66384cd475456876f0fa4a196f9d007f05009d
 DIST gerbera-1.6.1.tar.gz 3061089 BLAKE2B 6edd26318da6d69b43d983089bd31c0f77891590fe7094da9c77adb8e91418a11aecf0cc3c8fc602758a7d5aafb6e0f8726c85acfc89dc011c89f2565ede38e9 SHA512 488ce58fb1ef0c5412ba85876e04ecb6a71836f5064f29e9d4e786a4e66226522ca331be0c9c577bba3ea8dad7807ab032a0fe306bec0942e37bbfec25634247
-EBUILD gerbera-1.6.1.ebuild 2382 BLAKE2B 37a4b8eaf96e23f7d32d44e9d1fe2cfee5ec4ce6f33352a950e8e447cd8cae09c1b7cc44fb9cbe85ce5bbc6138f33d9593d58819d3534428614827f7a6f419de SHA512 20f7bc03960be4b81dc1a24c363390ad96e075d7c049c82c0013d32b48baf5179fa24ac05432bc08607efbd6525b0543de0342a2490055e638f4cdc477350a22
-EBUILD gerbera-9999.ebuild 2310 BLAKE2B 03da9d17449ebd6f00cf0460cead7a3772ac86d473a11f4b249e53cf50502cf1b932417e64cd1e432cd863fa3e896138fc6a9dd802ecd90e482652030bccdbe4 SHA512 320e649c649417b44fd7f87a4a10d21aa6489e284482167b7ee49afc6789a13d7433dc0bf05f1c6941934479be21e5b4b03b97082d98ffc6a14c7992a795777c
+EBUILD gerbera-1.6.1-r1.ebuild 2384 BLAKE2B 85849a8cd60154faa97a02cdbea3577055b593917b98d497c91e5c2190ee628a5c1b9308e512d92138f74819bd8d3ba72b098095731d8987b5aaab50a8b804a9 SHA512 978c07cb4de189122948cdf0f57960c93580b5a10fd3fa0c2078d68be1fff0ffd722d4f686d3245ee61cacd6bff1e7d36d525bcbc1f155764a41e7c20466a6c2
+EBUILD gerbera-9999.ebuild 2312 BLAKE2B e14fa49d9f340222dfe2510d529751d2d9768ef0cbb904d5a80c34870e292979041a63ecea9bd73be9b7623d9e76ff9dbb8015a5aa8af36753ff1c262977ae31 SHA512 8b37c17d9506c62a09b27be189b46b1b8e8711e8a4b499625d55c8af336f61b1b8a8eccb24c3d5eb3d7bda9f918fd1a1b2c667b42ae375030ba6fd422f6fbf86
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/gerbera-1.6.1.ebuild b/net-misc/gerbera/gerbera-1.6.1-r1.ebuild
index 56b7793c25ab..115656d77bf1 100644
--- a/net-misc/gerbera/gerbera-1.6.1.ebuild
+++ b/net-misc/gerbera/gerbera-1.6.1-r1.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	dev-libs/pugixml
 	dev-libs/libfmt:0=
 	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
+	javascript? ( dev-lang/duktape:= )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 219386720083..5f10c8bed087 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="
 	dev-libs/pugixml
 	dev-libs/libfmt:0=
 	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
+	javascript? ( dev-lang/duktape:= )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
diff --git a/net-misc/gwget/Manifest b/net-misc/gwget/Manifest
deleted file mode 100644
index 73a744fd262a..000000000000
--- a/net-misc/gwget/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gwget-1.0.4-glib-single-include.patch 362 BLAKE2B 21a9fdb143018f95f01dfcc24d5808500792f157b939d311ec5906c85774da3a341f901b4c3aa5a30ee3963251dabd8e176471c19616c837888f6b2e12f3677d SHA512 84bbe5d8f5f5add2a21623f8334d222e85b521dbcdc536833a327e35bd02a46726575b5fdab08939f233f2f744ef18fe66eb5f034dbbebdb73f5b18338e6938c
-AUX gwget-1.0.4-libnotify-0.7.patch 915 BLAKE2B 3d5a6cc23dae7dffde8ff0639847905b44f8d95af7c0373573f087622d4628ccdbfd3f24f27a37ae82bbea46a1d597a3d50150ce54b56bfdd026458dcf080354 SHA512 475ea6e694d95d80629eb1e9283ebcbd3d830af9083fa918fcd77588cb56f14b7f0c6d62fe279538a22c030e7bb12c9f122e7a98dc5b3ef79cfc000a1bf7baa1
-DIST gwget-1.0.4.tar.bz2 444843 BLAKE2B 8485aece30496c441d2ddc44dbbe08f17e698cc905ab465fc0b165a70a5ff264da3ef3773cea03ab3cd4e2f48b210d23507d7548549c5880e39d6e5bf955ecd5 SHA512 fab9d5eb4e6fd9d061a51848d7f4df9a44925ef8c74386753a7250c4d92b0c95419a8355acf83611c83838e87d906613659e146132a086ada0bdb69cc2ac13cd
-EBUILD gwget-1.0.4.ebuild 1119 BLAKE2B 2f1a81467b8725b9357bd2035357ebb430420792a8c1302995751d047e1f432b2fbd7ae462ef4f8bd861451a1aac3172f6b8f9c39ffbf19f0ea7e8c986ae679a SHA512 d57479967c3f153fa699ddfc425a86e7b3eb26d39176653ce064e67e2deb1a0d1c52381340266d43c4380551682bee123bd2dfea7be539c4e5c91971eca245fc
-MISC metadata.xml 1245 BLAKE2B d3808a239f373fa472c0993b9a59d0e3b464d096ed16ae7e42b71f0dc359bcf486ee8bb703269d2750703bf2a6a816d13b1721335823e4be9f5f5d753ea4c9a4 SHA512 5198416ddc65e2da2f2f883b955d51b78a8443e129c7fc9f40f0a5dc86f12e7b0f2ca1a2b29f827afe9e6507971876cf4f76db1aee4ce8bb08a83fa7a7987555
diff --git a/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch b/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch
deleted file mode 100644
index a5cf4ee995bc..000000000000
--- a/net-misc/gwget/files/gwget-1.0.4-glib-single-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gwget-1.0.4/src/gwget-application.h
-===================================================================
---- gwget-1.0.4.orig/src/gwget-application.h
-+++ gwget-1.0.4/src/gwget-application.h
-@@ -18,7 +18,7 @@
- #ifndef GWGET_APPLICATION_H
- #define GWGET_APPLICATION_H
- 
--#include <glib/gerror.h>
-+#include <glib.h>
- #include <glib-object.h>
- 
- G_BEGIN_DECLS
diff --git a/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch b/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch
deleted file mode 100644
index 8cecc197814b..000000000000
--- a/net-misc/gwget/files/gwget-1.0.4-libnotify-0.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/systray.c
-+++ b/src/systray.c
-@@ -6,6 +6,12 @@
- #include "systray.h"
- #include "main_window_cb.h"
- 
-+#ifdef HAVE_NOTIFY
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+#endif
-+
- static GdkPixbuf *systray_load_icon (const gchar *filename);
- static GdkPixbuf *systray_pixbuf_new_from_file(const gchar *filename);
- static void systray_clicked(GtkStatusIcon *status_icon,guint button,guint activate_time,gpointer user_data);
-@@ -224,7 +230,12 @@
-        		if (!notify_is_initted ())
- 			if (!notify_init ("gwget"))
- 		               return;
--       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL);
-+       NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+       );
-+#else
-+       ,NULL);
-+#endif
-        notify_notification_show(notification,NULL);
- #endif
- 
diff --git a/net-misc/gwget/gwget-1.0.4.ebuild b/net-misc/gwget/gwget-1.0.4.ebuild
deleted file mode 100644
index 1a843450cdef..000000000000
--- a/net-misc/gwget/gwget-1.0.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="GTK2 WGet Frontend"
-HOMEPAGE="https://gnome.org/projects/gwget/"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="epiphany libnotify"
-
-# FIXME: dbus should be optional
-#        needs patching for linguas/intltool
-RDEPEND="
-	net-misc/wget
-	>=x11-libs/gtk+-2.6:2
-	>=dev-libs/glib-2.16.0:2
-	>=gnome-base/gconf-2:2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/dbus-glib-0.70
-	epiphany? ( >=www-client/epiphany-1.4 )
-	libnotify? ( >=x11-libs/libnotify-0.2.2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0
-	>=sys-devel/gettext-0.10.4
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libnotify-0.7.patch
-	"${FILESDIR}"/${P}-glib-single-include.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable epiphany epiphany-extension) \
-		$(use_enable libnotify) \
-		--disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove /var/lib, which is created without any reason
-	rm -rf "${D}"/var || die "rm failed"
-}
diff --git a/net-misc/gwget/metadata.xml b/net-misc/gwget/metadata.xml
deleted file mode 100644
index 25e77310cc10..000000000000
--- a/net-misc/gwget/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <longdescription>Gwget2 is a gtk2 front-end for the wget program. Wget is commonly used for retrieving files from the internet, and with an easy to use gtk2 interface, gwget2 brings the utility of wget to the GNOME desktop. Gwget2 supports drag and drop from most gtk2 compatible browsers, as well as the ability to pause and continue downloads over sessions.</longdescription>
-  <longdescription lang="ja">
-Gwget2 は wget プログラムの GTK2 フロントエンドです。wget とはインターネットからファイルを回収するのに一般的に
-使われているもので、gwget2 はGNOME デスクトップへ wget ユーティリティを統合し、GTK2 インターフェイスで使い易くします。
-Gwget2 は GTK2 互換のブラウザからのドラッグ・アンド・ドロップ及びセッションを越えた停止と再開をサポートします。
-</longdescription>
-  <use>
-    <flag name="epiphany">Build epiphany extensions</flag>
-  </use>
-</pkgmetadata>
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index bcd3a4c4e381..5e5ab5715362 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,5 @@
 DIST httpie-2.1.0.tar.gz 1754801 BLAKE2B dabb6a1ce0cc4ecebbc7e933ed3084d7b75e0fac1fbf6968f41d37ee95cef684ee3603ddb5361e072328d13c9c98332b23bfdd0454da3399038307b124ea2e98 SHA512 39d56c9b9aad4871ce439a235377a930ad7c78b833f9bad568142efc9fd8af9123ac931e434c6ddb7fa6e0deb0acf8f5fd1ddf79f3b7a65467267cbf4629555b
 DIST httpie-2.2.0.tar.gz 1761927 BLAKE2B 3ce8acf4abf9cb189315e07e7f9c8dfc1b0a537696a2c9fd795e8e944c85c1df8e7e13fbaee68d3b93115296ba048e664d31245fe2c6b832123818292b4fac8d SHA512 00c1f34041854319816d7d643a79358723c27a3744f405d629b5361685745bfdd8ce0a0f127cb3d6746e46405d24562625ca37733a5955809d7bfc077ae5c533
 EBUILD httpie-2.1.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f
-EBUILD httpie-2.2.0.ebuild 1051 BLAKE2B 0fff59edd7b2731da9e2d8c45448d60f66ce20db4dd842491fe898a9ea2df00236151319b7b65005d2644d4bb753ec23110141bb802e24bfdc8702dda8f98947 SHA512 12efd9b94a95798ef5802e8610d3af43e3553ebcef42f8a15b6ce60312ca5ae6b5c9d2f806b5173541a0ebf4650a0b78f6470c4c3e910e5e82e2175ac574bbe9
+EBUILD httpie-2.2.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-2.2.0.ebuild b/net-misc/httpie/httpie-2.2.0.ebuild
index e3773e796fbe..bab02d0b537a 100644
--- a/net-misc/httpie/httpie-2.2.0.ebuild
+++ b/net-misc/httpie/httpie-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index 4c232ef5d82d..d2046541207a 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -1,13 +1,14 @@
 AUX 10ICAClient 61 BLAKE2B e2da5a69886dba37e8ccc9a4212cff2504a73a9a9da3c6f22f5ffe58e6661afce2858e224bbfdfde48e76b4cde4c0822da9b7ef39c357a3a3730a98d1f775c26 SHA512 a1eb61dcd636aab9770561d141241ae214870341ed85129e385509350cddb8f559eccbafd6832d000283d1a8ef0d7faf42910c76013d3cf97c8d4f036cd48957
 AUX configmgr.desktop 191 BLAKE2B 891069f75757cbe800053ee89e59c8eda2ce161a79a91def6895d3ce6b004b75395c167e88adb361a1f4ea5ff9b7a6b23a250a3d5a70c6fe4b875cc23a8ba8ff SHA512 ccb45da870e68e090ceb454ae4ef317e8834d2d0764ee3494dc3252b039be413ae27a27142040a130f2bcdd5a88d12bf598a432d31e0aa40581a5b682519aa96
 AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a2187be7598398c25d5e66dfaad932b893eea5b0d9d2a5b89d58b04e63811bfa03887da92d44c78b5cb0fc1 SHA512 53939f018a453b0cf40731af36ad55545f517a66d011dac2ccf0cf3f318f63f026e632e951b7c55e15d5f1841f23d0ad8ab4bc5adfb1ea92c9cb720c14af0261
+AUX ctxwebhelper.desktop 320 BLAKE2B 877ade9bf35ca53ca81315e7ab6e9854e35d2392ad337f7fa00242a4fcb0b65fccccb569cb52557d4eba856972ae610f6826562aaaa881f347db025e81d97d4c SHA512 616068f88a05c221cbb5b6d0f54911f7aebd271311ba3039eeccca3d9e0444e0423f53e10d138f6a9e64c78cc7225ade0b7df941aaf5e55e9862eb30a5678b07
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-20.06.0.15.tar.gz 115086774 BLAKE2B fbdec8b80364baf55c1429c1db76466630487e7efb05a8dc33011b5fdb90a7244d3a1b8990428ea1b210ac918c91f859fa9a5aa39ea2f747b0c52370e793b4cf SHA512 1b7d696978e89af5b460cd9985eaedf9d941d1acaccb6fc3ade8b174c342fdf682c70ea46e62c149490d3f720909905bcbe50519c985ec66b70f0731aa60d45f
+DIST linuxx64-20.10.0.6.tar.gz 119730020 BLAKE2B 62154534ee83f18ebd71c4f2d247863c028ad34dfea1fc1b182e3dd5ef3296f65a45860a1b613de286e9d1a5ac52f4ea00da92ba221619194608ccd453306112 SHA512 ec16064483c94c3b56caef622c2091e845613bd0926174fd40474f7f74d62a56f3d5dce2398e42b12a7c774b62dfe605ef7c9f7556d14814d902047a35154c68
 DIST linuxx64-20.9.0.15.tar.gz 117636697 BLAKE2B 4279fa23edd6be2c0cd73f4f1881815b377779d695b1fb110fd5a28aae6ef45649e9b9796ad6d637954bd4dd62e35aadbb352311297e10fa0923fb03ea42711b SHA512 6a5e2cc3f40ffd894548247df4ce2dd988293fa17e72ba101bd32250ac13ea077a80ab1129e7d85987333ad6afaf3c3e2fe75a642e66d21c87d07cf6c57adfb2
-DIST linuxx86-20.06.0.15.tar.gz 106253412 BLAKE2B e40bb86b688d5c8f83fa2d8cdd48ebd20fc8ebde305ea49cc726e48eaa12141130d648fca2bef25b59c1b4cefdabca0f53b497d4ee0e76bfa5aeede7df1aff4a SHA512 fb1d6104c9407f96bcdd6a385703fd142eb4b6347d35617d3bd09bd4908c6ad099933677688d4a77f9ce3c4b7f5c89fe24adb28bdc97112da5a58b618ba0e173
+DIST linuxx86-20.10.0.6.tar.gz 109881795 BLAKE2B 0deda5cd800a891a1c15f8e1b6f553b86ee1d90177ddb75460bc6f5a2afe40e9c56cc1427c25ed64ba66741ba0749efc736ea653ea633aefd086a3fb2e34d1d2 SHA512 027658ecc25775d3436a4a02f36a6fc7da766b909d2b21284e3d7f2c658397b4e3e496556eae84f241dca41b155ee2f7088780e5d89e295d641aadae3908cef8
 DIST linuxx86-20.9.0.15.tar.gz 108055955 BLAKE2B f94ff3e44152165d0122cc28c302df2bbc7401aaa7b61ee8e7479ffd44d6fcc25daac94211ba3dabed56d51b531d9a72a41e63dd2019880d956f2a4faa0269c1 SHA512 cddbef60ddf4baa1e9f45e80df78c2153907a4eb010649946ee10d0875c9066268a47d37ddd3f3cb026cf130a3f4e566d745f1b3781c13810b50476344cfafb4
-EBUILD icaclient-20.06.0.15.ebuild 4606 BLAKE2B 1bab1521a347da2ce9a9278c10d14951df0adc684c60e8c0289d3f29497024b2227f539f6890ee4aa6e5332845bd2d5eb6aa64ba6cff41ece0872ada52e69390 SHA512 380e52cc685c874db97a1f2265e44638b776fce938a8d36681a2a8bbd3a06e0ab06865c26a217531c5dcd5607772967d7bc43df6d08e721ed34224528b896d43
-EBUILD icaclient-20.9.0.15.ebuild 4608 BLAKE2B e7ed3501ac4ffe9808f0451188e5db05a874f9e17f9a2a26b18eefe7ce01abf1693056635a28fa33b24003f1010474847df2d66ec5935592c9d754eea1a8dc69 SHA512 1082496a0979cb827839a5a9f874de889b3440de71f41411a3b9613c20ecda314ea498c79543c3ea05285466288aaccb07f3ed15d347ca20a335bf13bc573eb1
+EBUILD icaclient-20.10.0.6.ebuild 4855 BLAKE2B e8c9f6e9041cff306a5dc9c5255dc536119f71b4bd8f6e9af15f796070fe3b2ee8bcef150489b7c4cc77f61a5fa606f07a6d9276c02e4a78e6619722c956c773 SHA512 b586a4a1706468cf6a8cc294b3f41913b04698809bafcebea9ebf6b9bc809684f29849e15eef4da7212c6354b46ea8952a2d8d5878fa487f152f9697e6dfe1df
+EBUILD icaclient-20.9.0.15-r1.ebuild 4853 BLAKE2B a0110efc3e3fc44cf83cc288b16923771f9722c62122e377fd420afb9366892ca221618790fdba390eca5538be64e0511d2f426c7437f0d52e902b9b58c6ace4 SHA512 0f71d26f20635ade089d35e56435342332d6dc8b3862bd68ae5a1cc8b71e51018aa28e22a2ca9c33aca9411136db8e751f475e730abc2ee21929240457928130
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/net-misc/icaclient/files/ctxwebhelper.desktop b/net-misc/icaclient/files/ctxwebhelper.desktop
new file mode 100644
index 000000000000..7d535cacf6aa
--- /dev/null
+++ b/net-misc/icaclient/files/ctxwebhelper.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=Citrix Web Helper
+StartupWMClass=Ctxwebhelper
+NoDisplay=true
+Categories=Network;
+MimeType=x-scheme-handler/receiver;
+Icon=/opt/Citrix/ICAClient/icons/manager.png
+TryExec=/opt/Citrix/ICAClient/util/ctxwebhelper
+Exec=/opt/Citrix/ICAClient/util/ctxwebhelper
diff --git a/net-misc/icaclient/icaclient-20.9.0.15.ebuild b/net-misc/icaclient/icaclient-20.10.0.6.ebuild
index dc55bef4c529..7c0393e74900 100644
--- a/net-misc/icaclient/icaclient-20.9.0.15.ebuild
+++ b/net-misc/icaclient/icaclient-20.10.0.6.ebuild
@@ -42,16 +42,22 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4
 	net-misc/curl
-	sys-libs/e2fsprogs-libs
+	net-misc/nx
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
 	sys-libs/zlib
 	virtual/krb5
 	virtual/jpeg:0
+	virtual/libudev
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXinerama
@@ -98,7 +104,9 @@ src_install() {
 	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
 
 	exeinto "${ICAROOT}"/lib
-	rm lib/ctxjpeg_fb_8.so || die
+	if use amd64 ; then
+		rm lib/ctxjpeg_fb_8.so || die
+	fi
 	doexe lib/*.so
 
 	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
@@ -169,9 +177,34 @@ src_install() {
 	rm -r "${S}"/keystore/cacerts || die
 	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
+	local util_files=(
+		configmgr
+		conncenter
+		ctx_app_bind
+		ctx_rehash
+		ctxlogd
+		ctxwebhelper
+		gst_play1.0
+		gst_read1.0
+		hdxcheck.sh
+		icalicense.sh
+		libgstflatstm1.0.so
+		lurdump
+		new_store
+		nslaunch
+		pnabrowse
+		setlog
+		storebrowse
+		sunraymac.sh
+		webcontainer
+		what
+		xcapture
+	)
+
 	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
-	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+	for bin in ${util_files[@]} ; do
+		doexe util/${bin}
+	done
 
 	# https://bugs.gentoo.org/655922
 	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
diff --git a/net-misc/icaclient/icaclient-20.06.0.15.ebuild b/net-misc/icaclient/icaclient-20.9.0.15-r1.ebuild
index fef0ba0d608e..c6398836aa03 100644
--- a/net-misc/icaclient/icaclient-20.06.0.15.ebuild
+++ b/net-misc/icaclient/icaclient-20.9.0.15-r1.ebuild
@@ -42,16 +42,22 @@ RDEPEND="
 	net-libs/libsoup:2.4
 	net-libs/webkit-gtk:4
 	net-misc/curl
-	sys-libs/e2fsprogs-libs
+	net-misc/nx
+	sys-apps/util-linux
+	sys-libs/libcxx
+	sys-libs/libcxxabi
 	sys-libs/zlib
 	virtual/krb5
 	virtual/jpeg:0
+	virtual/libudev
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libXaw
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXinerama
@@ -98,7 +104,9 @@ src_install() {
 	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
 
 	exeinto "${ICAROOT}"/lib
-	rm lib/ctxjpeg_fb_8.so || die
+	if use amd64 ; then
+		rm lib/ctxjpeg_fb_8.so || die
+	fi
 	doexe lib/*.so
 
 	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
@@ -169,9 +177,34 @@ src_install() {
 	rm -r "${S}"/keystore/cacerts || die
 	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
 
+	local util_files=(
+		configmgr
+		conncenter
+		ctx_app_bind
+		ctx_rehash
+		ctxlogd
+		ctxwebhelper
+		gst_play1.0
+		gst_read1.0
+		hdxcheck.sh
+		icalicense.sh
+		libgstflatstm1.0.so
+		lurdump
+		new_store
+		nslaunch
+		pnabrowse
+		setlog
+		storebrowse
+		sunraymac.sh
+		webcontainer
+		what
+		xcapture
+	)
+
 	exeinto "${ICAROOT}"/util
-	doexe util/{configmgr,conncenter,gst_play1.0,gst_read1.0,hdxcheck.sh,icalicense.sh,libgstflatstm1.0.so,webcontainer,ctxwebhelper,ctx_rehash,ctx_app_bind}
-	doexe util/{lurdump,new_store,nslaunch,pnabrowse,storebrowse,sunraymac.sh,what,xcapture}
+	for bin in ${util_files[@]} ; do
+		doexe util/${bin}
+	done
 
 	# https://bugs.gentoo.org/655922
 	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 584a189853ca..495b88cf1406 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -17,4 +17,4 @@ EBUILD iperf-3.7.ebuild 947 BLAKE2B f292caa6b05da89f13a0465ce03a04158cd94cb62660
 EBUILD iperf-3.8.1.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851
 EBUILD iperf-3.9.ebuild 937 BLAKE2B 6ceb1d1d47cfe96fb2cbb74ae4a1f422eaf4260d90c162abdb6cbbbb674d80e989b6787c1978917dbb5318f1ce7e8e28fdd1b39caeddfb5421a0e4f966600a25 SHA512 50eefade254d88d80fcbbade5a26918087704b7f8c715d40303602921ca9bc04ab562472180e3f6ba60881f083ffcc3c9a53346cc747b0963fa756ebfc935851
 EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357
-MISC metadata.xml 455 BLAKE2B 63c2a5eb313e525820e470ca060751f9f7486147d30b59fc135cfbc1235814df004b1d0cb741842ce2380ff69e938d0105ef5a37a794c1b523b246a0c75e2613 SHA512 36ebc27e7e4b2a3577a4c532b19d0b1e61a3261a59510453689772d568972796b32acafc161f9dc8483602105ea804fbb43e9a445fd44e7869278c19cba42b93
+MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index a18ccf22423a..3ad52d67cbfd 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<upstream>
-<remote-id type="cpe">cpe:/a:iperf_project:iperf</remote-id>
-<remote-id type="github">esnet/iperf</remote-id>
-<remote-id type="sourceforge">iperf</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:iperf_project:iperf</remote-id>
+		<remote-id type="github">esnet/iperf</remote-id>
+		<remote-id type="sourceforge">iperf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index dabc5e48c36c..395837962ce2 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,8 +1,5 @@
 AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
-DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux.tar.gz 138691420 BLAKE2B 7f2d8e9519d6a9651d09c8b55e6a530266b809e437132ac4a814473ec25622663a0fb455a3b078fd5e79194e82d24d1b324369799f15bd1d4dbb6b607cdada76 SHA512 17078c8480579e63391a8cfb7af5033510ca3a9c5616b2af0af7679bbd6592f4f7fbe68dc01194aa11c1b481bc1c4089339adb42c22a687effa05dd728984579
-DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz 135584164 BLAKE2B d74ade013d00e7c7dd5d79b808d158519a520603931dfe9bd44f4dc64911b066f0e9f61bdff7386ee30d2d5b1f4fb86477ee339e76f00746f0b119c3a4b49e82 SHA512 2409f79850cafb2af5f34ec3fd755a6438ef7abef3c1a014df95d4ccc49d9b151ddfba7c1824de9c0f00234ea36b2fa6bb519f5035321dccae9ac06fa2f9458a
 DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B 915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766 SHA512 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
-EBUILD ipmiview-2.15.0.190109.ebuild 2389 BLAKE2B 251caeefbe35ea4f88c6fb9f6c4dc3e3ac8beb992aab4fe91bd1037cd1ffdae21e4daee57af69a026e48715d7f9e3bb822482d408442eb72dfa81438233e2d4d SHA512 ec5dfc4088d33cfd70b704e263518424f26aba1c3c6ffe0ee4e43533cd60edf9f29e96a8480aab147e73439833a6180cdc817639b4a080278887acd0862c26fa
-EBUILD ipmiview-2.17.0.200505.ebuild 2197 BLAKE2B fe4c5b9f9358e32fe42696f2a6cfcabead5ff37c84ada6b36ca33ff1ad357d30f7fed6c5bf0b14e3228c68f5a0d905e592f2dbf6ec3e07a100610f6c094b4712 SHA512 06fcadc842fb8abfbdd876e677f31bf6a77de45f59b30a2403ac0b5bcc154c7e30890cbabaeec4ead1f35acc9d219e6dd2376c580e5b0bf10f0cf5f44ef12390
+EBUILD ipmiview-2.17.0.200505.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
 MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce
diff --git a/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild b/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
deleted file mode 100644
index 7d565a17b74c..000000000000
--- a/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eapi7-ver java-pkg-2 prefix
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="IPMIView"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="
-	amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )
-"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	net-misc/stunnel
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist fetch mirror strip"
-
-DIR="/usr/share/${PN}"
-QA_PREBUILT="usr/lib*"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
-}
-
-src_prepare() {
-	default
-
-	# Extract icons for menu entries
-	unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
-
-	# Don't use their scary launchers
-	rm -v lax.jar || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_doso $(usex amd64 '*64.so' '*32.so')
-
-	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
-	java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
-	java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
-
-	exeinto ${DIR}/jre/bin
-	newexe $(prefixify_ro "${FILESDIR}"/fake-java-r1.bash) java
-
-	insinto ${DIR}/lib/BMCSecurity
-	doins BMCSecurity/*.{crt,key,pem,txt}
-
-	insinto ${DIR}/lib/BMCSecurity/linux
-	doins BMCSecurity/linux/stunnel.conf
-
-	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
-	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
-
-	doicon ipmi{view,trap}.ico
-	make_desktop_entry ipmiview IPMIView ipmiview.ico
-	make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
-
-	local DOCS=( *.pdf *.txt )
-	einstalldocs
-}
diff --git a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
index 664d3944d27e..e6d9549403ff 100644
--- a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+++ b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
@@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)"
 
 DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
 HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
 
 LICENSE="supermicro"
 SLOT="0"
@@ -19,22 +19,17 @@ KEYWORDS="-* ~amd64"
 
 RDEPEND="
 	net-misc/stunnel
+	sys-libs/ncurses-compat:5
 	virtual/jre:1.8
 "
 
 BDEPEND="app-arch/unzip"
 
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist mirror"
 
 DIR="/usr/share/${PN}"
 QA_PREBUILT="usr/lib*"
 
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
 src_unpack() {
 	unpack ${A}
 	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64 ${P} || die
diff --git a/net-misc/iprange/Manifest b/net-misc/iprange/Manifest
index c1a69b036d28..202791365f0d 100644
--- a/net-misc/iprange/Manifest
+++ b/net-misc/iprange/Manifest
@@ -1,3 +1,3 @@
 DIST iprange-1.0.4.tar.xz 104336 BLAKE2B 8b2dc82de89e2de92e873afbb8bcd0c1a0f9200619726d482ceea435131c4d18454856d8f808a03711a0967128a539c0e3abd94d9f2762262e43eeed6c4b885e SHA512 28fa258c95e6a7b0bb304b8fee624cfd8ef1a5b24a98a80c3dafe44639e6dc0de22c3b61a33794533c3d9fc0ba41f5663a6bb6c85cf940d57c64db043ccbdac9
-EBUILD iprange-1.0.4.ebuild 333 BLAKE2B ccbdbba5126e1a6aafd1a27c64e1b7d7a14b9d287c73741633e030d37ea23db295329a0e086bbb2cb391b63269b532ec80587bc4c538bb0a0f3d9d750e0f68ca SHA512 6136ed62ecbd1d7efa20bb4b48baa1917088e7705a67eb25689b1513fe77131b13a11bc49f1c7c2d2016a017e418e7d30a5232a5af6dc3bef745ff9a30c50c4e
+EBUILD iprange-1.0.4.ebuild 340 BLAKE2B 808ed828d00829254088c7b04a377f445dd32b2eb98146690f8dc1d5bbcf4191707622fbf40d8d29a59235a402031225227d2dcd4c2b3695515e2beb86687914 SHA512 5de6b426416b65f2c4c1772a8d76df99c7742f5613281b38a8f9a6b66269d2a74430c57bf2af32cc482c25901c95c2a19cc86971abc5b0d8ecb945e758c23e47
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/iprange/iprange-1.0.4.ebuild b/net-misc/iprange/iprange-1.0.4.ebuild
index 19aed1a10454..3c70abfae233 100644
--- a/net-misc/iprange/iprange-1.0.4.ebuild
+++ b/net-misc/iprange/iprange-1.0.4.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/firehol/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~x86"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 1a4571640f39..bb4654d865eb 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -6,7 +6,7 @@ DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c
 DIST iputils-20200821.tar.gz 504852 BLAKE2B 3ce31554937e28ca3edd204b4b4ba2d11a5eab4ed0d9257cc1f0df38e3ac4d9093f786f308c96c35e1b4909be5de51a0bfb25d890269d9bd7bdd3ea5f612c299 SHA512 4a57c3637cdd9aab2600682774e27370716cbdf1c7ac8ae61bf86c21c08701a5b697792df4aa95309b196eaa74f3cb6b2836a40f04da0e602156e982ac99d8c9
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 DIST iputils-manpages-20200821.tar.xz 19200 BLAKE2B 7d139ccac181eb3d74e3dcd2ba28cb906a0002aa4922de3e37771e2063234fa12428fa44bab3b50e43c40576a66d585a7460cf550afbeacd665fc41a3333d11a SHA512 0dd385565c9a15dfce668d637e055004a347056ee56260a4e726e7aa5ba5a6374aea8e9fc848dfe36b7609e5d92cb8c21f3e88f2d63e7cfe299489e41a17dc33
-EBUILD iputils-20190709-r1.ebuild 5054 BLAKE2B 917fae9c9867ef740c55121a47d1d4e34365f7c224e148e812a17c2d1556e41c60a2b13f97fd8e2cd69ea6e9f9eb6135eadbce5d338651c92ba37812b35a4257 SHA512 87e8b0cc765316ac1507a5e0f96c852effa7ddcd971baba445dc5e62fef8e96d0cffac545770d740444ac4131582002e0a22aaabe9b104ea9783e7bd7b24e337
-EBUILD iputils-20200821.ebuild 4435 BLAKE2B 3bdc031997db6288820fd9c7dce345415540d39a88bb4d63c2a2cd551c32abf7528d48681e6f54dd172577d3a2dd922798abb31070e4d4ab62d273b400a58a4f SHA512 0877a4e23496151e6f2a00609868cfe4fa5a4af8eb5c853f67a173920702d4c3c736168b6fae885e6c52eac247a4fed90c30f7290bf178949092458c94f6a534
-EBUILD iputils-99999999.ebuild 4435 BLAKE2B 3bdc031997db6288820fd9c7dce345415540d39a88bb4d63c2a2cd551c32abf7528d48681e6f54dd172577d3a2dd922798abb31070e4d4ab62d273b400a58a4f SHA512 0877a4e23496151e6f2a00609868cfe4fa5a4af8eb5c853f67a173920702d4c3c736168b6fae885e6c52eac247a4fed90c30f7290bf178949092458c94f6a534
+EBUILD iputils-20190709-r1.ebuild 4996 BLAKE2B 4e8f817686cd25059a6529305c6684187d3a21689b8f14e45e77c53dea89be75f64e4761410a7e34c17db386e1accacd994cd181912f21e32a51d507cf8212a4 SHA512 55467ba100f7d27a1d21ec2eb99463e024766079aa15d454ddee0760349f15e519f518774c5b8f911e65fdfdc0ac0218d8918d6fcc66575a53a20221ae7a2696
+EBUILD iputils-20200821.ebuild 4270 BLAKE2B 64d10e025f198647efd7d9011e3769688373f7e85716d3c89cf9f97cb09f71a9fdeb8b83045878a203df94e56b7ee85b4860f68e2a8fa2e03ad49db2d73afd07 SHA512 353f7251c805b32b2d2dd26189b0b68580ec328d06a9644fa036724d8c104dd10bc93a1d2a892a36751fac291a5a627badf4f09073288183dfc545308e93e6b4
+EBUILD iputils-99999999.ebuild 4270 BLAKE2B 64d10e025f198647efd7d9011e3769688373f7e85716d3c89cf9f97cb09f71a9fdeb8b83045878a203df94e56b7ee85b4860f68e2a8fa2e03ad49db2d73afd07 SHA512 353f7251c805b32b2d2dd26189b0b68580ec328d06a9644fa036724d8c104dd10bc93a1d2a892a36751fac291a5a627badf4f09073288183dfc545308e93e6b4
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild
index 9f1ae6cb1779..8c298933d65a 100644
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ b/net-misc/iputils/iputils-20190709-r1.ebuild
@@ -50,8 +50,6 @@ LIB_DEPEND="
 "
 
 RDEPEND="
-	arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
 	traceroute6? ( !net-analyzer/traceroute )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
diff --git a/net-misc/iputils/iputils-20200821.ebuild b/net-misc/iputils/iputils-20200821.ebuild
index 3365b1ca6cc5..967aaeb3a6ea 100644
--- a/net-misc/iputils/iputils-20200821.ebuild
+++ b/net-misc/iputils/iputils-20200821.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -39,8 +39,6 @@ LIB_DEPEND="
 "
 
 RDEPEND="
-	arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
 	traceroute6? ( !net-analyzer/traceroute )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
@@ -66,8 +64,6 @@ fi
 PATCHES=()
 
 src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
 	default
 
 	l10n_get_locales > po/LINGUAS || die
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 3365b1ca6cc5..967aaeb3a6ea 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
 
 BDEPEND="virtual/pkgconfig"
 
@@ -39,8 +39,6 @@ LIB_DEPEND="
 "
 
 RDEPEND="
-	arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
 	traceroute6? ( !net-analyzer/traceroute )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
@@ -66,8 +64,6 @@ fi
 PATCHES=()
 
 src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
 	default
 
 	l10n_get_locales > po/LINGUAS || die
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 7905e843c14a..516787e4947b 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,4 +1,4 @@
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
-EBUILD jwhois-4.0-r1.ebuild 680 BLAKE2B 6461597b296fd49ed32d38b9678b4216e3c3fea378e4b92cb4285981673cab7798f5aa6d1d8c90222e2ee910fafe6921ed1bb9aff9d9c926fb1ba0d3432521be SHA512 ca0b7762f3be7183d042ba0aac3b8f7a8ac608531431dcbde8681f49fec4da1f999504ac4b19c7b78137844f047354ad8cbdd6c47973f248afd9eb92b3360947
+EBUILD jwhois-4.0-r1.ebuild 655 BLAKE2B 4c4aafdcbb8f0dd3b0782caa76e754972a410ba5e60aa9f1254a3cfd61d0a5673591900ac39126b0e01f6517aa6ce120286548bbd5b414f06110cdf3b6ef701c SHA512 99af6d6a030f9725f8e41ae98bb49dba2dfe8b217c52f099b65a77e20c87a4f64daa32feb59fc88297a7484b278098674028ba89c4c06fc1595e497b443d4813
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
index d8bcb3ddb180..7a6fe53d31c8 100644
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
 HOMEPAGE="https://www.gnu.org/software/jwhois/"
@@ -17,13 +15,14 @@ IUSE="idn nls"
 RDEPEND="idn? ( net-dns/libidn )"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-connect-logic.patch #208875
-}
+PATCHES=(
+	# bug 208875
+	"${FILESDIR}"/${P}-connect-logic.patch
+)
 
 src_configure() {
 	econf \
-		--localstatedir="${EPREFIX}/var/cache" \
+		--localstatedir="${EPREFIX}"/var/cache \
 		--without-cache \
 		$(use_enable nls) \
 		$(use_with idn libidn)
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index f842b0acf571..2a716bbc034e 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,6 @@
-AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
-AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.7.10.tar.gz 7513433 BLAKE2B 7b7accccf1200c8673669d4db7ae5efa628a409661b3f82d6dc85c191578cb73fc85866307a1626a0c4a48f81df4f4ad3f5a2b9d8d5f682de2e8fc5750b56ff5 SHA512 b5f6c7c6538f767b604ff59e4cb8acb0a85bfa7611f9dbdc1b17cc70d483d6fcdc4978ccda8dd010623b2126d0b8ddf4275012f492b1c57f7b210bfd946e4a68
-DIST kea-1.7.9.tar.gz 7481156 BLAKE2B eef2561b79ad83c18d42a0d23e97fc27205190475c24bb871112050b5ec0a134c4c448c03c4f1b678aadf7d54c7f96481c43485187408f8bfebe6f2c6edbc832 SHA512 180e80dbf21789e9c18c69b9e03a2ad4519eb3386cf8c4221a283883eb8151443e888b6a95d1affb0790ef25d6174582448bf590eb2ddadb12b965cba7dc8717
-EBUILD kea-1.7.10.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
-EBUILD kea-1.7.9.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
-EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
+AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
+AUX kea-initd-r1 1980 BLAKE2B 338cc159d54d62d3172fd8bba5213d82058bb90b90085be1d0e41a071966cdc76325ce881c075cfac04850c1adad8ea502c85873607fe7487168797a0658e184 SHA512 5685a83ac59f67f9832a270ab737672185200669b2b13f6c5df19a2285bd98ff89e44ac53097cd6f86858bd1f243f52ff3e2a4b334ab147d612cfa30d5ff34eb
+DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
+EBUILD kea-1.8.1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
+EBUILD kea-9999.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/files/kea-confd b/net-misc/kea/files/kea-confd
deleted file mode 100644
index 568468eb3a1d..000000000000
--- a/net-misc/kea/files/kea-confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Which services should be taken into account?
-DHCP4="true"
-DHCP6="false"
-DDNS="false"
diff --git a/net-misc/kea/files/kea-confd-r1 b/net-misc/kea/files/kea-confd-r1
new file mode 100644
index 000000000000..ef7b2f49dd9d
--- /dev/null
+++ b/net-misc/kea/files/kea-confd-r1
@@ -0,0 +1,10 @@
+# Which services should be taken into account?
+DHCP4="true"
+DHCP6="false"
+DDNS="false"
+
+# Define your config files here. Otherwise we default to files in /etc/kea
+# (see init script)
+#DHCP4_CONFIG="/etc/kea/dhcp4.conf"
+#DHCP6_CONFIG="/etc/kea/dhcp6.conf"
+#DDNS_CONFIG="/etc/kea/ddns.conf"
diff --git a/net-misc/kea/files/kea-initd b/net-misc/kea/files/kea-initd-r1
index 85fdd56b9ec2..57711b3c9d36 100644
--- a/net-misc/kea/files/kea-initd
+++ b/net-misc/kea/files/kea-initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="kea dhcp services"
@@ -7,7 +7,9 @@ description="kea dhcp services"
 dhcp4_command="/usr/sbin/kea-dhcp4"
 dhcp6_command="/usr/sbin/kea-dhcp6"
 ddns_command="/usr/sbin/kea-dhcp-ddns"
-config_file="/etc/kea/kea.conf"
+dhcp4_config="${DHCP4_CONFIG:-/etc/kea/dhcp4.conf}"
+dhcp6_config="${DHCP6_CONFIG:-/etc/kea/dhcp6.conf}"
+ddns_config="${DDNS_CONFIG:-/etc/kea/ddns.conf}"
 dhcp4_pidfile="/run/kea-dhcp4.pid"
 dhcp6_pidfile="/run/kea-dhcp6.pid"
 ddns_pidfile="/run/kea-ddns.pid"
@@ -23,20 +25,20 @@ start_pre() {
 	fi
 
 	if ${DHCP4:-false} ; then
-		if ! ${dhcp4_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then
-			eerror "Error in config file."
+		if ! ${dhcp4_command} -t ${dhcp4_config} 1>/dev/null 2>/dev/null ; then
+			eerror "Error in config file ${dhcp4_config}"
 			return 1
 		fi
 	fi
 	if ${DHCP6:-false} ; then
-		if ! ${dhcp6_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then
-			eerror "Error in config file."
+		if ! ${dhcp6_command} -t ${dhcp6_config} 1>/dev/null 2>/dev/null ; then
+			eerror "Error in config file ${dhcp6_config}"
 			return 1
 		fi
 	fi
 	if ${DDNS:-false} ; then
-		if ! ${ddns_command} -t ${config_file} 1>/dev/null 2>/dev/null ; then
-			eerror "Error in config file."
+		if ! ${ddns_command} -t ${ddns_config} 1>/dev/null 2>/dev/null ; then
+			eerror "Error in config file ${ddns_config}"
 			return 1
 		fi
 	fi
@@ -46,17 +48,17 @@ start() {
 	einfo "Starting kea dhcp services"
 	if ${DHCP4:-false} ; then
 		start-stop-daemon -m -b -p ${dhcp4_pidfile} \
-			-x ${dhcp4_command} -- -c ${config_file} \
+			-x ${dhcp4_command} -- -c ${dhcp4_config} \
 			|| return 1
 	fi
 	if ${DHCP6:-false} ; then
 		start-stop-daemon -m -b -p ${dhcp6_pidfile} \
-			-x ${dhcp6_command} -- -c ${config_file} \
+			-x ${dhcp6_command} -- -c ${dhcp6_config} \
 			|| return 1
 	fi
 	if ${DDNS:-false} ; then
 		start-stop-daemon -m -b -p ${ddns_pidfile} \
-			-x ${ddns_command} -- -c ${config_file} \
+			-x ${ddns_command} -- -c ${ddns_config} \
 			|| return 1
 	fi
 }
diff --git a/net-misc/kea/kea-1.7.9.ebuild b/net-misc/kea/kea-1.7.9.ebuild
deleted file mode 100644
index 2f6a4dc21e8a..000000000000
--- a/net-misc/kea/kea-1.7.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
-		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql +openssl postgres samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:2= )
-	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}
-	acct-group/dhcp
-	acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-perfdhcp
-		--localstatedir="${EPREFIX}/var"
-		--without-werror
-		$(use_with mysql)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_enable samples install-configurations)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	keepdir /var/{lib,run}/${PN} /var/log
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/kea/kea-1.7.10.ebuild b/net-misc/kea/kea-1.8.1.ebuild
index 2f6a4dc21e8a..3e20776fe7e7 100644
--- a/net-misc/kea/kea-1.7.10.ebuild
+++ b/net-misc/kea/kea-1.8.1.ebuild
@@ -66,8 +66,9 @@ src_configure() {
 
 src_install() {
 	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	keepdir /var/{lib,run}/${PN} /var/log
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+	keepdir /var/lib/${PN} /var/log
+	rm -rf "${ED}"/var/run || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 2f6a4dc21e8a..3e20776fe7e7 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -66,8 +66,9 @@ src_configure() {
 
 src_install() {
 	default
-	newconfd "${FILESDIR}"/${PN}-confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	keepdir /var/{lib,run}/${PN} /var/log
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+	keepdir /var/lib/${PN} /var/log
+	rm -rf "${ED}"/var/run || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/net-misc/linuxptp/Manifest b/net-misc/linuxptp/Manifest
index 0464c057ced6..bbb6b6a53429 100644
--- a/net-misc/linuxptp/Manifest
+++ b/net-misc/linuxptp/Manifest
@@ -1,4 +1,5 @@
+AUX linuxptp-2.0_nettstamp-systypes.patch 1374 BLAKE2B 2b90a983e99cea7c686cbb28eb7c53fece2ad22dda0a898fa3ba0a867686d500f288e24c18c473729d48deda99565069b4983ee02f56214bab6367e6a19ff9cd SHA512 e9e0ae1be45c1d3d71cbf9c7df30584e52d8169755f516e920eb49e52c0dea5e388c36e92d9d000112d7630631cdc97d2eaa55fab1413d13d145a4970b1b7120
 AUX timemaster.service 234 BLAKE2B c59cfb10a85db09dc48830b166e6c3338949a2f12b4170a00d0f5b44f118fff5a56dd2fb74fecead5068f8b345399bb27dfef1e382fa27a777e9ddc65b7b92a9 SHA512 d3b1f7fb31ca0b233575bc491ba52700be8d586ead5657facda3b84141cd1467b55c52f4cafea972f13d1c647cc8b3bb1092bca580fd0b0d135688d00a641a82
 DIST linuxptp-2.0.tgz 184942 BLAKE2B 79ef9d3c379769a71e652a77f05ab661db444a76a339e72106055cf900de9cabfe303c48760f11701fefe5e641d07b73fc5a250078bedf7faa3ae995ace24da3 SHA512 c33487a803f8cc461f790d9a137d5cf8b35cb6d292bdd2cf7a16aa666359d8c5e24667473be843182bef1e9f8d5c6af8aab8918978f10bf08257dd408bba66d6
-EBUILD linuxptp-2.0-r1.ebuild 940 BLAKE2B b5dc69b6bcbd537c1e74623594812878691af84fa5da361302ec2290e7ddf75cd2af92d81d2d7ccba145317f758ed29b0558213eecb3dc23661523ae3f314ddf SHA512 d96b4a9e586478704fad4dc125533db1d9d88510fd161ffb04209c0fefac40c5709b6139ff7114ee7de4f7724d7137ef12c5bbe1075dcc631f3fc8c0da5d4f01
+EBUILD linuxptp-2.0-r1.ebuild 1003 BLAKE2B 434b6f80bb5a3bcb3f187c50e5e388f8552f14a8f23b277d96d8d85d5d0608302948bcad7b25c89e1d911be22392f6ef67f88a21257295025780cca1512bca65 SHA512 73755062bd6e4d0618fcbfc3747e5f2bd708b1c5f3b7b3170dd36834ecc3103ff8e06c800bd86d113269c4ba722d637b47fd887db28bdfad5ecae1cb438c4733
 MISC metadata.xml 327 BLAKE2B 2f8f68a89168272c97f38af2ee447d621164d5f2c31bbaf75818d1386b4082ce59cfe724d54b9b118bc835c1832c4e7fe5b7c6c4b83fd36f48dc7f24701fa2eb SHA512 a98a1fe6de19dad7ab76f21672de567f3f8ac16c857194f4435d260741a9c2bc4f04d268fbc539aa6f1f1d2203bf509416e7e2970f9c24c4d31651a11eac6cd4
diff --git a/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
new file mode 100644
index 000000000000..d3f8e5d92906
--- /dev/null
+++ b/net-misc/linuxptp/files/linuxptp-2.0_nettstamp-systypes.patch
@@ -0,0 +1,52 @@
+net_tstamp.h needs clockid_t to be defined, so must include
+<sys/types.h> before including <linux/net_tstamp.h>
+
+
+--- a/clock.c
++++ b/clock.c
+@@ -17,6 +17,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #include <errno.h>
++#include <sys/types.h>
+ #include <linux/net_tstamp.h>
+ #include <poll.h>
+ #include <stdlib.h>
+--- a/hwstamp_ctl.c	2018-08-12 23:08:43.000000000 +0200
++++ b/hwstamp_ctl.c	2020-02-07 13:49:53.256859722 +0100
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#include <sys/types.h>
+ 
+ #include <arpa/inet.h>
+ #include <linux/net_tstamp.h>
+--- a/sk.c	2018-08-12 23:08:43.000000000 +0200
++++ b/sk.c	2020-02-07 13:50:12.334599236 +0100
+@@ -18,6 +18,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ #include <errno.h>
++#include <sys/types.h>
+ #include <linux/net_tstamp.h>
+ #include <linux/sockios.h>
+ #include <linux/ethtool.h>
+--- a/timemaster.c	2018-08-12 23:08:43.000000000 +0200
++++ b/timemaster.c	2020-02-07 13:50:19.848500949 +0100
+@@ -22,7 +22,6 @@
+ #include <errno.h>
+ #include <libgen.h>
+ #include <limits.h>
+-#include <linux/net_tstamp.h>
+ #include <net/if.h>
+ #include <signal.h>
+ #include <spawn.h>
+@@ -34,6 +33,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#include <linux/net_tstamp.h>
+ 
+ #include "print.h"
+ #include "rtnl.h"
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
index 60e25c5dd150..6594c946478c 100644
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
@@ -19,6 +19,10 @@ RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~PPS ~NETWORK_PHY_TIMESTAMPING ~PTP_1588_CLOCK"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0_nettstamp-systypes.patch
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 }
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index afd39bca828c..2d89e6177c92 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -14,8 +14,10 @@ DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f
 DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
 DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
 DIST lldpd-1.0.6.tar.gz 1814839 BLAKE2B d4bf30a7ae5a5de93f67ef6b06662e287a4c2eff76f157dc9b0a551b4473e0b0896e7af1cd39866f2ee0013ebdf572e762d8543a00bda0d0a1136cfedc7f2ba9 SHA512 b0930cf3202eba6bcbb7d5f941bda16ebbdde15f1839c6664c2896f92a7c2842cbe87baa32c7ce85f1d1fe012a8ceb9975a06244644a4bc3759241a4a1d058d1
+DIST lldpd-1.0.7.tar.gz 1815150 BLAKE2B 53bd73ce4cadf9c49f93a7ec5459adba0076d40156ba25c9ea6985b10a2cfec74a741318e74fa59bf560ce129eed2faf2964c093019b27e922c3dd10ed7daa13 SHA512 32fc153d0376db797163e4654c75cc8d10c35b85d7bb611996920bf67dfd2f30e154328a6e81837d9f77e8b4b7dd9ba76c81c5dd5847faa083654b8405d0bd69
 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 2356 BLAKE2B c54530cc9ae48dde1b11f426e9dae87149fa4c783b309c9ab52a16c02024595a6527ac898663ea3d73271fe6132232f8b8c510ebcc03cb9b6c397c555dc85da6 SHA512 46f7d387f267e781764096f58f5020c84c2b4231f25b184d8eedfeb2d5a54609d08ebe07885fde505f506c9e44de5eca6e0943fc5c00f4ebfdf1ee1d220b04d1
 EBUILD lldpd-1.0.6.ebuild 2322 BLAKE2B c25595742c11bac5b47132e49900500a447b8636d3858512685b3d7f5220e6fda7cef4c0b42a4f56ff486975cb222972d79864b08d732658255c47d5656adff2 SHA512 256af531af6e0adc62e31a0638fb1a63c11c44b7b02c5ec1ff4c5fc06e32b33460d8515451d6cdec2e05c7d58f5257abb2582051a5b11d4e6f74f1ca8f5b024c
+EBUILD lldpd-1.0.7.ebuild 2268 BLAKE2B abdd53f12a1ac074bfd324a92fb21ca75d233df07fdc4a2e8389f2a2e452ba46a630a1808e8d95408e93d962e20a3a8033fc904271315888ddd2711dc4241c87 SHA512 67cfcc5a407c243f5e9984d58c6732257d87628eaca4afc84141cd9d11c46ec31d599757dc5b8ed1d3f8d285ca02a78c940a9e2b0d33320bda4c175c8a1ebb28
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/lldpd-1.0.7.ebuild b/net-misc/lldpd/lldpd-1.0.7.ebuild
new file mode 100644
index 000000000000..dce1189ca422
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/4.9.0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
+	>=dev-libs/libevent-2.1.11:=
+	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2:= )
+	zsh-completion? ( app-shells/zsh )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+"
+
+REQUIRED_USE="graph? ( doc )"
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index c89074ab3f2b..dc0acd2e7f85 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -9,7 +9,11 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
 DIST memcached-1.6.6.tar.gz 543661 BLAKE2B 04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36 SHA512 dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a
 DIST memcached-1.6.7.tar.gz 547791 BLAKE2B 7ee39a5867cfaa52eb5cfb947ce42f711e030422b03b5c5547284d5cab91c044d04293cc355da3b868fb0ca02e151aec5980e455c1bb8067e38682209b1e3e4e SHA512 8b4c44ae4da8577cc5431aaca6118fdba27c42418a51a6d319d9040a975371a2fda9fcea2cb44c3d20c92f08961cb5f0ddd28c2f4cd12986b73c9342d91ea2c8
+DIST memcached-1.6.8.tar.gz 548024 BLAKE2B ab20f2c2e5a8f6cc4e0e1ef26e21f5d5b0baae35df887abd427d460591f9eadebbc08217a52e153c60b98098051ef855b918b74983bcb26f50b413caf508dca8 SHA512 256dd2b62fe9365183a44d9df99510f99f2fbb01d2afdf1558987331e7e746407f1caf5b93c82cb3e9b22ca8f8bc3d021706faf3849e60e43d9fdf7c1ec7cdcb
+DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
 EBUILD memcached-1.5.22.ebuild 2945 BLAKE2B 0c4c35283d3974009dbd401699b8bb10e695b9d608daceb87402316b083772c2f1ef932d9ccf72ca17bc895602e7ac032fcd215bf7a40a9d29d8843ef774b01c SHA512 a22de0a032ffd098a4283ebf97aefc0e315744d59893c61110a46eba734f78ec4f98d1c8968756471811244fd02c38b7d17f83a385aeb1117aec0dee9a977618
 EBUILD memcached-1.6.6.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
-EBUILD memcached-1.6.7.ebuild 2881 BLAKE2B 46e83166f00bda0762f966c90b943260d2e648ae57cf1bfa48e750367fbe7c7e4dc8e52906f17f4c12085ac50a72ac471e87fb958eb777fbf7b4d1728acfb0e7 SHA512 342fdc991a53c4dfb58b54682384cfa7c803a26d435f01dbf06cd23688fae99ab4d2736024c0d3bf0df596beb74326be262f7147a88965f590257dc3a08bacbb
+EBUILD memcached-1.6.7.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
+EBUILD memcached-1.6.8.ebuild 2881 BLAKE2B 46e83166f00bda0762f966c90b943260d2e648ae57cf1bfa48e750367fbe7c7e4dc8e52906f17f4c12085ac50a72ac471e87fb958eb777fbf7b4d1728acfb0e7 SHA512 342fdc991a53c4dfb58b54682384cfa7c803a26d435f01dbf06cd23688fae99ab4d2736024c0d3bf0df596beb74326be262f7147a88965f590257dc3a08bacbb
+EBUILD memcached-1.6.9.ebuild 2881 BLAKE2B 46e83166f00bda0762f966c90b943260d2e648ae57cf1bfa48e750367fbe7c7e4dc8e52906f17f4c12085ac50a72ac471e87fb958eb777fbf7b4d1728acfb0e7 SHA512 342fdc991a53c4dfb58b54682384cfa7c803a26d435f01dbf06cd23688fae99ab4d2736024c0d3bf0df596beb74326be262f7147a88965f590257dc3a08bacbb
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.6.7.ebuild b/net-misc/memcached/memcached-1.6.7.ebuild
index d1349f310a79..563ec54b1aea 100644
--- a/net-misc/memcached/memcached-1.6.7.ebuild
+++ b/net-misc/memcached/memcached-1.6.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.6.8.ebuild b/net-misc/memcached/memcached-1.6.8.ebuild
new file mode 100644
index 000000000000..d1349f310a79
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.8.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild
new file mode 100644
index 000000000000..d1349f310a79
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 1ab26511c7f7..8cb0748fd408 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,7 +1,8 @@
 AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8
 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
+AUX minidlna-1.2.1-fno-common.patch 1209 BLAKE2B 51994c0cfafd354745ddf83fa3a134a661459bdbc9661007f1ed3e056e6b9b89a44649496f83841ee83e454b1664594d34bae3757f2af582811e2ca2c8c4a77a SHA512 67ee0b86dc639b65d912cef96c617652d349d49e32a89538c2dd7a340e58a657b471cd6155aca8656cca44599d75ca96016d29a9a8107501870e511251782384
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.2.1-r1.ebuild 2694 BLAKE2B 7931acde7b9cff535e4eb64f52110ecc7edccdfdd88d00cee2fce217a307bccb81a89c4b62a8998ff7b7ff7e28bf32e396d188788b8c09c65a698243afba816d SHA512 fc915f8dc7465a8e2d5e5edcc9c84f6cf6f26e5cea2f584f044ff9fe074721e4c8a91b73852fe6d6691c3f7859fab1c7fe98b58f0cb2cce7f75e658bc71cd4ee
+EBUILD minidlna-1.2.1-r1.ebuild 2785 BLAKE2B 313911fc6b289e4912d7d431ff14ed26ccc657d298241df4229c6fb462ea7aa848e72bbfcdfaf1bd2a7c20e5617c8b6f07476c5535f65796bae430a32170b7e9 SHA512 ae59f442bac0748275b767239be6ccc216ce33bfdde623b3daadb09dce08a7825f9ad1747195cd21ae8b44c205398c2d968f7ee3074a0275f7abda3f95aa3347
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
new file mode 100644
index 000000000000..5cca89b52db2
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.2.1-fno-common.patch
@@ -0,0 +1,45 @@
+--- a/image_utils.c
++++ b/image_utils.c
+@@ -190,7 +190,7 @@ jpeg_memory_src(j_decompress_ptr cinfo, const unsigned char * buffer, size_t buf
+ 	src->pub.bytes_in_buffer = bufsize;
+ }
+ 
+-jmp_buf setjmp_buffer;
++static jmp_buf setjmp_buffer;
+ /* Don't exit on error like libjpeg likes to do */
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+--- a/metadata.c
++++ b/metadata.c
+@@ -484,7 +484,7 @@ GetAudioMetadata(const char *path, const char *name)
+ }
+ 
+ /* For libjpeg error handling */
+-jmp_buf setjmp_buffer;
++static jmp_buf setjmp_buffer;
+ static void
+ libjpeg_error_handler(j_common_ptr cinfo)
+ {
+--- a/tivo_utils.c
++++ b/tivo_utils.c
+@@ -27,6 +27,7 @@
+ #include <sqlite3.h>
+ #include "tivo_utils.h"
+ 
++struct sqlite3PrngType sqlite3Prng;
+ /* This function based on byRequest */
+ char *
+ decodeString(char *string, int inplace)
+--- a/tivo_utils.h
++++ b/tivo_utils.h
+@@ -30,7 +30,9 @@ struct sqlite3PrngType {
+   unsigned char isInit;          /* True if initialized */
+   unsigned char i, j;            /* State variables */
+   unsigned char s[256];          /* State variables */
+-} sqlite3Prng;
++};
++
++extern struct sqlite3PrngType sqlite3Prng;
+ 
+ char *
+ decodeString(char *string, int inplace);
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
index 47ee6484cd27..9d6ba5c94f4b 100644
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="netgear readynas zeroconf"
+IUSE="elibc_musl netgear readynas zeroconf"
 
 RDEPEND="dev-db/sqlite:3
 	media-libs/flac:=
@@ -24,6 +24,7 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/libvorbis:=
 	media-video/ffmpeg:0=
 	virtual/jpeg:0=
+	elibc_musl? ( sys-libs/queue-standalone )
 	zeroconf? ( net-dns/avahi:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -32,6 +33,7 @@ CONFIG_CHECK="~INOTIFY_USER"
 
 PATCHES=(
 	"${WORKDIR}"/minidlna-gentoo-artwork.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-misc/minissdpd/Manifest b/net-misc/minissdpd/Manifest
index 0c5061b598df..9b9bc890f977 100644
--- a/net-misc/minissdpd/Manifest
+++ b/net-misc/minissdpd/Manifest
@@ -2,6 +2,7 @@ AUX minissdpd.confd 487 BLAKE2B aeb624644debe2e9ba438f9839f526fc9411e6f4d355bf46
 AUX minissdpd.initd-r2 1522 BLAKE2B 35bde96e182529f0dd10ec4081c495ba1f52706dc191e29fa99ebb7d37b302578e492f705d4f724744ec3a9ca455730f01294e2a781529c3750193fd8e84cf50 SHA512 6d14fa0730b4c1f0e6a6765c80250ebd01d69c6fd3341049fae276a3d0ae2ec806cdfeb3b7897be0b62e426c7c9d7fb59514a0d67bb751a2e41f9b9616cc9ade
 DIST minissdpd-1.5.20190824.tar.gz 37300 BLAKE2B 3a04f6af0af8ce5d26e4860ceafe2c52f1ee562f179094fbcba3485c85ae75b7374fd7fa8f89ec6d9ce2a10bb94120618de40e0191fc7ecdd1e813a2b9c5d6af SHA512 79a14482b69a88b778e484a3b3e98964c420ff7576ac818ba60fd5e07f5b31754cdef3ee00d9189ba0a33f0268f11acd1f7c4222d8d0958920d1f568ec7755e2
 DIST minissdpd-1.5.20200928.tar.gz 37860 BLAKE2B fc80660ed84198d08d5879e276a0b5ab49c66344c8841f223990f704b6ebf70c8411da1d84ec51a9f69285a6b5a804ebe6b197555f5684d55cd0bf3abe250704 SHA512 e44142dcec4d0d4029a9d93748a8b3edec5482e2313d290956d3829b04e3637f6ba81292f27effad8829b29bb59f7fc43666338a8423d683ca6daa5807ea6362
+DIST minissdpd-1.5.20200928.tar.gz.sig 543 BLAKE2B 5fdedfe4b042924667c329aa964e006cc9a5aad1e2d4f11d46c6689e7d88b4614c383bfb666ca9a7c90b37256a4e38dcc85e479687688578dd198893fcf5d3cf SHA512 15477061b009991a05323a66582bd7ba9c9aa3a1a7c84eca93b27adf1b11ede81063d9de4695fcf3567f3c367a730afe4cee0fa95cccdecd316d08021956cf6b
 EBUILD minissdpd-1.5.20190824.ebuild 675 BLAKE2B e45aa1fc469be382e2b90c22d1af62522ebcc4059e89bc6a902fb7c25c0f07b3c8a2655b7237b3ac77f4aeca36681dba6d94cbb09f26c0a7dad2b4919def5342 SHA512 ca94ce5f8c01f040587ae4772cf80d3fc2977216d9d9e897c9cc0e62019e23c52619c77eba8b5ecb4faa2f5ba2d731ce0d16fbc84207e1f678cec9dcda2c58c6
-EBUILD minissdpd-1.5.20200928.ebuild 769 BLAKE2B e1f593ce0c940c315e92d516281747d103d7ee3de6fac8ad24ce443fb7cf9c60b7479d8ccab0624dc002e504ee52deb1398703f0195eabfcf26b7af8b0ca91c9 SHA512 85e3d092f256e8a15bfe44a62b3e8cb1fbfcc7635ae1a5087224c3ca7e689491dd2434fc76a623233ea86ff0b3a247fd9854ed14a5b2022c3fc341a9851bdf00
+EBUILD minissdpd-1.5.20200928.ebuild 970 BLAKE2B 19e025bb874e1ef5554a2f18a5794cf0f9f5194d6a3d7d111e4321d0f7d347c4acbaad0cee3fe5c8e410ab8ad8464cbc206038ae339796feb4ee768b42ce07b4 SHA512 9f70df6c063235fb790dcd39cfc33eff8226d2a531afe733921713a16e0f6861b9612bd21106b6bb87c528cc6ef57637b95c5d53cb289af39c3493583cf96f46
 MISC metadata.xml 360 BLAKE2B 7e083fa0362b52310ab298a0684308dbe220a6f6acb7b99c99cf6bf22cb9406da9d34e021a367d50eaefa67f133c5b57f01d4b63aa46887ea15bf4c66ad5e5e4 SHA512 fbf209d07841a834e1d216090879be7a1e739f7ddd1e649d40d24aabe8782d2ed55a37fe8525453cb96137f1c76044087a6b435c786877349bbe939485d7b855
diff --git a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
index fd2d7685e495..f6632eade218 100644
--- a/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
+++ b/net-misc/minissdpd/minissdpd-1.5.20200928.ebuild
@@ -2,21 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
 DESCRIPTION="MiniSSDP Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${P}.tar.gz.sig )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="net-libs/libnfnetlink"
-
-RDEPEND="$DEPEND
+RDEPEND="${DEPEND}
 	|| ( net-misc/miniupnpd net-libs/miniupnpc )"
+BDEPEND="
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_configure() {
 	sed -i -e '/#define HAVE_IP_MREQN/{s:/[*]::;s:[*]/::;}' config.h || die
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 075e6b8fec6c..ba9ef5484ff0 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -2,6 +2,13 @@ AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20c
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b
 DIST miniupnpd-2.2.0-RC2.tar.gz 248756 BLAKE2B 428f353496f4410ae2ddce96d8edca1d4addf4f77c1e794ba48b5ac7fbe12368f994d91c04eb5d54fbddd24f5e6d36aa87e4cfb4f60b8e3f08f3bf96b5b7f094 SHA512 17dd31477c018f3f26b05a9ab5370819f763bcab6c00f3bb13ea87bc3781f5dcd190e294837b85a9e41b4fe7d1bfa0b475ef8da2f1fa48c3fe357c284f585508
+DIST miniupnpd-2.2.0-RC2.tar.gz.sig 543 BLAKE2B 678b76fcc994d66dad6988a272d99db1f1eb89096b72e171f9ee94c59734ff5a1885316ac2564119614b0a9c653cf7e7d88a6b9f291a6588d4577e669d2b4775 SHA512 fa6c93501b6bf5eef763d0ee637233458ddb6e2aac0ec92554c803ed29e6d3fb35e8618a7316fddc07a009a5a7b702351226ef2eaec6dd5404bea47d5fb0ebe2
+DIST miniupnpd-2.2.0-RC3.tar.gz 249879 BLAKE2B 718c40d9dadc17eca9544c499c75888ced5f058bb75e564d5bf17ef490200dd2055ba43cb265ec26381a14697e814524ca849deead4493b0e5de37bf6121e1b3 SHA512 2f946521e922016e58179dc9d6c5ce783a93dab9117066dea05d4f27a854dc9b7a92ea475df6565856294ecf82698a885968aa7b3325244ea87e695901bac3ed
+DIST miniupnpd-2.2.0-RC3.tar.gz.sig 543 BLAKE2B 4d11b6aa3e39f417e00e9aade4e5f2d0292595f64500a7d22fabc0e04e1784ebebb8616eaea5b7b93fd4ba1d83ee547cf2de7faac4578848b8bc213c54a9e264 SHA512 2fe3086103debbcb88774fc2428e09628aac3e0f686d1141f9c1bf38a8f0229e682bfa70bf939435bca6371750c601fd8b6fa2304b4f25fcc6cf4288ece1cf1d
+DIST miniupnpd-2.2.0.tar.gz 249858 BLAKE2B ef216c7703cb9806a3719b247d67c5c844879308eafbef0936fc501305dbdada7b32e6fc212e50ee093c6f5728709da3d2d5114e89de52a124c229c63ee03563 SHA512 ac8bc3c140f369d0f92d203b94a4f73dde682a486c4395cd25aafda3461577b4a2a1d3160cf8bd37fa8520cda4f86cbdaec925b2ef4e9054e7bf10e04a227d3c
+DIST miniupnpd-2.2.0.tar.gz.sig 543 BLAKE2B 11778dd70128ece1f80144bb229176c53f3cd89847a8eedd4fe1b75ac55d986ae7c4689edf40f80c4605ba42260bc41f8fd069e99b8c249226ab9e2981d15412 SHA512 5e0e053a2a3ab876da001589677b0f5e3a4df8511ea5185dbbaee9b80928f9cb9705029f1c83bd9d26b144e39721fce1c4c8c33983956b6731ae654bc094063c
 EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
-EBUILD miniupnpd-2.2.0_rc2.ebuild 1877 BLAKE2B 8932e7d747cb064f04d7de06e51649a344cc2feebed2880c8a9afef85deaf62442b7c94dcfb5653a19cd2e080c1e14abf0cadaf9f8c69b84cda72305933f166e SHA512 dd355469690c59df2a19b74f75d58aabd0cbbc3056d53628fcef599be5bfb2db2c2a8d981f913db2a9dbbd51b6a5708ffd3a45d36246b1e66377fcc27c84236e
+EBUILD miniupnpd-2.2.0.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
+EBUILD miniupnpd-2.2.0_rc2.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
+EBUILD miniupnpd-2.2.0_rc3.ebuild 2096 BLAKE2B 6b601880e0f1304055db875e2a2dbd67483848a7f104fdee47ae1f581b3cc8e97542d368745e18296178082104ec2e6a77af3b2d03000abd08970cb79637edc7 SHA512 06db84831b29bf3d34c8e35bce36b0b797622143d156ff9d0ff90d331d0ad2d9b0374c1e6b16765a903e67a772330eae51a91844d8605b9cf1c826dde7961e80
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild
new file mode 100644
index 000000000000..1c2981def4c4
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
index e80efef5db1b..1c2981def4c4 100644
--- a/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.2.0_rc2.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs verify-sig
 
+MY_P=${P/_rc/-RC}
 DESCRIPTION="MiniUPnP IGD Daemon"
 HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P/_rc/-RC}.tar.gz"
-S=${WORKDIR}/${P/_rc/-RC}
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,8 +31,12 @@ RDEPEND="
 		net-libs/libnftnl:=
 		net-libs/libmnl:=
 	)"
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
 
 src_configure() {
 	local opts=(
diff --git a/net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild b/net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild
new file mode 100644
index 000000000000..1c2981def4c4
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.2.0_rc3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs verify-sig
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${MY_P}.tar.gz
+	verify-sig? ( http://miniupnp.free.fr/files/${MY_P}.tar.gz.sig )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/lsb-release
+	verify-sig? ( app-crypt/openpgp-keys-miniupnp )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/miniupnp.asc
+
+src_configure() {
+	local opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
+	)
+
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 9651ddce1109..658bc65bb6de 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,5 +1,5 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
-EBUILD mosh-1.3.2.ebuild 1509 BLAKE2B c4d9e6d0b10d7f97b1f43afbe5ed8069a1fca302877ac6b0abe91761d0486ed5e39fb70bf9e0acde444e91bd3ac4f9c0899da3b6b1e2c0c087f66edb3ad12913 SHA512 1de597aed7f93ad5081031c8e582620e2ae31e6b3b5410211c896f09ed37ec98c5e18112c60433d068fff62743d8473b3912f6f557db2f900d1324b8bd43002d
+EBUILD mosh-1.3.2.ebuild 1505 BLAKE2B aacf3edb966dfbd5134ecbf3a7276702e387436092c4236e60812998ce1ebc8fe1c78094f873ed15b6f47b80ab31240f3effa1e2fa920e0fe87729c29513a24a SHA512 9f2e085153c04d7b549732eaaef87e9962de449751311ed9df87e2ce675834c3cbcd8397aada2d6c18170301642ba725587eb4821c8b801e0ae83771e1af8829
 EBUILD mosh-9999.ebuild 1453 BLAKE2B b0f0c891713b3ebc5679198c7952743f5e87dc9aa093b1c61e311695f71cb928cdd7ef7b8cdc6e9befaf9b9eb2dec5a626faf011216014ce3de967d68e72f0a4 SHA512 9ed66cdcbb7e600a2c35369077942566d0b28da2dc289b58cf79d299617234b1f328e79c60fb61a8ece77c99982b73968f20903fe651c0e13ea27e7759c92eb2
 MISC metadata.xml 1046 BLAKE2B b82f683b0b6a236f78d9e46378e5bf14bfd1ff232045c9a56490e1d19a58767ba1f78647e57b60217aa3851059c4a96c4c8218fbd5387203ad34ee5f577e0f32 SHA512 a4d754df5abc7fec2838525e5fec6386086a4afbbd1132cb4360fcea8211f6bf1629a00b5ddc64faad8e89ccc9a8bc82a9467b6bbdedc6a7503447d84407589a
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index bfd31a5abc1a..87a94b12e9cb 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index ffd350c2675c..f478c8774ef4 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -7,5 +7,5 @@ AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f9388156
 DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
-EBUILD netkit-rsh-0.17-r10.ebuild 1758 BLAKE2B 98376fc94edca1888267ce9a94c1b2d4a175fb2aa91f853f3c625004b5a801f37bae804ca40643588dc5aee731c1acb72196e099297a844d45926fbeea749c93 SHA512 ca727808d05be4ff1dc04bbfaf895cd38a96126bb247c698f0eec3de9aaa77a73a0d8d5f5a03de558e4837c4518caa299d400fb8868500150fa5e9e4cd81da6a
+EBUILD netkit-rsh-0.17-r10.ebuild 1725 BLAKE2B 7317968ab5b1aa667b0415938a600cf6dee2a85757eb8af146f5116bd9b8915b3a41ece7d2b6ad517e9824ab080de469954e76beca80f3203b78197898dcdb6e SHA512 d799b685f0e09de5ad017b42add240a6886327a9aecd7ab562f5b490f1ca11f9064f40f370ccbd79865b3b11fbc31925521b16d18f100e344cc90ed533ac55f7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index ca08fdef4cd7..673104c20ba8 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils pam toolchain-funcs fcaps
+inherit pam toolchain-funcs fcaps
 
 PATCHVER="3"
+
 DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
@@ -17,29 +18,24 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam"
 
-RDEPEND=">=sys-libs/ncurses-5.2
+RDEPEND="
+	sys-libs/ncurses:0
 	pam? ( >=sys-auth/pambase-20080219.1 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-FILECAPS=(
-	cap_net_bind_service usr/bin/r{cp,login,sh}
-)
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
 
-src_unpack() {
-	default
-
-	cd "${S}"
-	rm -rf rexec
-	mv ../rexec rexec
-}
+FILECAPS=( cap_net_bind_service usr/bin/r{cp,login,sh} )
 
 src_prepare() {
-	[[ -n ${PATCHVER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	rm -r rexec || die
+	mv ../rexec rexec || die
+
+	[[ -n ${PATCHVER} ]] && eapply "${WORKDIR}"/patch
+	eapply_user
 
 	if tc-is-cross-compiler ; then
 		# Can't do runtime tests when cross-compiling
-		sed -i -e "s|./__conftest|: ./__conftest|" configure
+		sed -i -e "s|./__conftest|: ./__conftest|" configure || die
 	fi
 }
 
@@ -55,8 +51,9 @@ src_configure() {
 }
 
 src_install() {
-	local b exe
 	insinto /etc/xinetd.d
+
+	local b
 	for b in rcp rexec{,d} rlogin{,d} rsh{,d} ; do
 		if [[ ${b} == *d ]] ; then
 			dosbin ${b}/${b}
@@ -65,12 +62,13 @@ src_install() {
 		else
 			dobin ${b}/${b}
 			doman ${b}/${b}.1
-			if [[ ${b} != "rcp" ]]; then
+			if [[ ${b} != rcp ]]; then
 				newins "${FILESDIR}"/${b}.xinetd ${b}
 				newpamd "${FILESDIR}/${b}.pamd-pambase" ${b}
 			fi
 		fi
 	done
+
 	dodoc README ChangeLog BUGS
 	newdoc rexec/README README.rexec
 }
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index fb0445e4ba88..4d9d33619a4e 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -2,8 +2,6 @@ AUX net.issue.sample 117 BLAKE2B 8b0b60e93aeacd53eb46318317dc54d747fa6a7c009da72
 AUX netkit-telnetd-0.17-cflags-gnu_source.patch 828 BLAKE2B 947bb4a47a9e032ab89647b5b30f6e6b494ec3aeeff5bc5c03ba3d5d6137077f435c08bddc284418584119b5001bf4b5f1beddf6b7b15e36608e7001f5498ebe SHA512 9baa5178d32bec960fd7c8c3041468243f14a9554ad82093186df872446d920d3c3073f2773db10f0e1edec9dbc60e194afad2abf189a9a253b2ce0595e6715d
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 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 2483 BLAKE2B 92bef79a3be411c680ad49651eba5e07fb3b1067f06b1f492d0bb292e2c67cbcf2ea841fff6e5620fadc9e7994ec1d7b497c4f4214588df9a3caa8c7691474b6 SHA512 fc3994a97d7910099e74e35387ac83517da200f6e815d2d6e189ba4f962edf573ad149f02dbbd98ddf0621967c5000385eb2db8203af4cb4297b158e1700a3c7
-EBUILD netkit-telnetd-0.17-r12.ebuild 2510 BLAKE2B 1447a3df0ac3d8a8081b90f7af273ee9932ba23959ef049af94c17ad9315afe1a74ae15723d16b06f4fba1300f443c05a46e4d91be9c67c0b8d6a27dd088f8b1 SHA512 f3607be170eb971ec43de23dc72948993a7d1700dee068f021ee6e66aa28262fd748748dcb49aa5238c4966498278bc4a2775f5ffebb2b1fa6350c24b7a6f8d2
+EBUILD netkit-telnetd-0.17-r12.ebuild 2502 BLAKE2B df7618f701486383af55a3185cc71ec2e7118ee542e9131db8db61b35a1368c409c74c7ed8a667efb78ac50a0ec9718e637d63a848350ecfb326ce367b9b05e8 SHA512 a01e0cf2f2a84eb0462e5ea082e426a1f9fa9b969eeb308325a3ae149ad2fcf1dd042e4913e0a1242b5416457f1c78f015c06341649417a5d20964a2727a9889
 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
deleted file mode 100644
index 4bbca3926ced..000000000000
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-PATCHLEVEL=36
-DESCRIPTION="Standard Linux telnet client and server"
-#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
-# This might be the best HOMEPAGE now?
-HOMEPAGE="https://launchpad.net/netkit-telnet"
-# http://packages.debian.org/stablesource/netkit-telnet
-# http://packages.debian.org/testing/source/netkit-telnet
-# No upstream mirror exists anymore?
-# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
-SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
-	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2:=
-	!net-misc/telnet-bsd"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/netkit-telnet-${PV}
-
-src_prepare() {
-	# Patch: [0]
-	# Gentoo lacks a maintainer for this package right now. And a
-	# security problem arose. While reviewing our options for how
-	# should we proceed with the security bug we decided it would be
-	# better to just stay in sync with debian's own netkit-telnet
-	# package. Lots of bug fixes by them over time which were not in
-	# our telnetd.
-	epatch "${WORKDIR}"/netkit-telnet_0.17-${PATCHLEVEL}.diff
-
-	# Patch: [1]
-	# after the deb patch we need to add a small patch that defines
-	# gnu source. This is needed for gcc-3.4.x (needs to be pushed
-	# back to the deb folk?)
-	epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
-
-	# Fix portability issues.
-	sed -i \
-		-e 's:echo -n:printf %s:' \
-		configure || die
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	# Not a real autoconf script.
-	./configure --prefix=/usr || die
-
-	sed -i \
-		-e "s:-pipe -O2:${CFLAGS}:" \
-		-e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \
-		-e "s:-Wpointer-arith::" \
-		MCONFIG || die
-}
-
-src_compile() {
-	emake
-	emake -C telnetlogin
-}
-
-src_install() {
-	dobin telnet/telnet
-
-	dosbin telnetd/telnetd
-	dosym telnetd /usr/sbin/in.telnetd
-	dosbin telnetlogin/telnetlogin
-	doman telnet/telnet.1
-	doman telnetd/*.8
-	doman telnetd/issue.net.5
-	dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
-	doman telnetlogin/telnetlogin.8
-	dodoc BUGS ChangeLog README
-	dodoc "${FILESDIR}"/net.issue.sample
-	newdoc telnet/README README.telnet
-	newdoc telnet/TODO TODO.telnet
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/telnetd.xinetd telnetd
-}
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index 559f510fd686..c2f66be105d3 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gentoo/netkit-telnet-${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 7df3d3a5c97d..f597bb46749c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,25 +1,15 @@
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 058694194cacd2c42f9f327f6f9b100eb0c8f73a634c0125d448ca5a486a919ae8b305832c1b39c74cd0dadd7bbbce80e3403ba42d9d7ce5fc9146cfb7d2c97a SHA512 22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214
-AUX 1.18.4-iwd1-compat.patch 3033 BLAKE2B 4f25f0f425ad13a91776d11d3df4d153f0ebdd67a91d5da756af45753241455d2393955ba7281b6339b39b77639f5ebf30253cbdff5ad44ba9717387f71f1f2d SHA512 aac04da2da739d068f353144a5b792b106defc426677e28cdb9eb3c70af783265b905b516b168d068b6bf0c0fb98987a5395721ccf6fee4eec1acde98b413505
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
-AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
 AUX networkmanager-1.20.6-dont_call_helpers_with_full_paths.patch 574 BLAKE2B 179dfdcdb97bfc66adbeb58ca0e0b8f95f6d1cc0687fef338bc25ac59b4dc83e20e547d419ef8cea482c6302a05bbce8279c868f00c0cb173f42ebdc6a4bdcae SHA512 ab3e96bbd88b4a5c0aac59dc8de437be78f2e77762d6bc9c99e3b1ff1d7db39a054c4fd9ba9e2f6f9907da1ef66c8af310562addaa79ecd9e9812564f609a273
-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
+AUX networkmanager-1.26.4-iwd-fixes-pr640.patch 5730 BLAKE2B e22539fef2e4582ab156decbe26667724de181eb2349f7dcb29c41eaf9f918addb4a6e25a43e8b743e118cab56e3f69cc83e0e8ee777560c227165fad67664b9 SHA512 690d128ac153b2147f13f8596858be6e6120c0a744da1cb5e2dad5ce6ae9518565ab15a9a00612771d153ed5e13d60a42f93fae6b7ba177513c9d1bf0a4d701a
 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
 DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d
 DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
-EBUILD networkmanager-1.18.4-r3.ebuild 11431 BLAKE2B 76cb824cea61c07fb21a59dc8bee989eddcaf2ad289a899d8aa5c3a865331dc5298f5e3ca92caf1e32cb081f3ab83138df56066b8ef0ac0708cf63998e002295 SHA512 a791b582b8f90aeb845f2f04052ac24ef11a5dfc6427205a76255a625e6a26cb00ac87e0b5bd5b5fb20e44259417ccd6a039a0f97cd1989b922f1f369eb609e0
-EBUILD networkmanager-1.18.6.ebuild 11432 BLAKE2B 2ef7ce19c9cd88dc3164ac651d766bbbb7fbbe2175e58fcf4eabd613cfe8cf1457678cddf0d2383fa021824e83a55d0d44734294933d95f86487b8883a8fd3f2 SHA512 852ccdbdd1c6c46ec6301f97b3108d202c1eeed3827a4cec9098a3c6d91eabb26b43f591d6bc7d2c3bbc746433efb5ba7416fe9623a5606e62fd19e317f6e323
-EBUILD networkmanager-1.20.12.ebuild 11088 BLAKE2B 0dbdfd04968daad96115958bc1340fb16dec34ec8f43f0d51acee7ecd46c310b0e041130318420d5436c78134d88f13594b5201adf710c66fc5a3a4e6318e680 SHA512 c07598b70aad185a490a179f5e92b80c62af536a77dbcde44a9506d034ae0c48d4b2a4dc115a66778dfe92650605aac353ff764389f3709d642b3053744c139d
-EBUILD networkmanager-1.22.10-r11.ebuild 8778 BLAKE2B cfcb2044f5f9d7bfef67cfda7d58d032ca9e2cce7e9a0ee0fd64caa9875c6f6873a01823f4b56a1ecd25680dba145bf5688c580f5c465601eaef0313ebf65381 SHA512 a271e30d97f2effe6b12a168c10e4a898bb0c4105c73525db4c864cb9ab0b2a2bc3241a74f22f74fa7f1a5d6d99fdbbc528be5c28c77a2cd1adcfc159ed1e7d4
-EBUILD networkmanager-1.22.14.ebuild 11203 BLAKE2B d1a13257f060d03c6ff000777b0b04e422511e2c5c9f4ebf31ad49932b9b3fd47e3ece8850541c21cb70c2091381e130914a6660ebd815535122e6d864e54beb SHA512 7302dcc4bebee3787879cbb1bd6580e883d79d93e3e54a929106dd0ec4e607f9e957730db21e6851d2ef28726d636f47c12d2f52f44e1823cc20923e4c04a4fe
-EBUILD networkmanager-1.24.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a
-EBUILD networkmanager-1.26.0.ebuild 11142 BLAKE2B d90518063b598948f8e2e738ed8840c2f343447ed5e94fa5013dbf9a990e232ffd261da6ad2a97d6d7567f32563292fc145e03ff92e78cec3015e3007187348e SHA512 ff34f2ab285394818399535fdda1d3e3752c72cb1c6b4bb0c5aa6ee97e5c46c1ad25fa6016f14d4deacdcef79aa207c51710cf74aa9d460312b0bd168d7de665
-EBUILD networkmanager-1.26.2.ebuild 11148 BLAKE2B 850dea825fca18780b8110ae09d61b07902b8fcbeff67cff7bd359e2e06a6641b2f3fc6e3b0ce7ab3ceaaf03fab3baec31d8690e380db4e8a85a11c5e9ed7f0b SHA512 bf1f69b2fa2656683498501d1705c249ac317dd19f729d17b8c82db643311d65056b8588714b22b330e694ee44340526771f052f76bf2ddbc6545f00531fe25a
-MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89
+DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328
+EBUILD networkmanager-1.22.10-r12.ebuild 8550 BLAKE2B 2bc90b456b46a5240e05c52a6afe59b4320d905363a3bad0ae4d0f41e3d0584d2743a76c255be198cc0dffacfd29109deb59d67749b06423e3155c1f624c9150 SHA512 00e785287a1ff4cf9260b8cb5d342ead2c1e3568095d5a7074b72df8269940a46e257b95f36a335055ec3de17de8fae527b99434253dd06d1bc04e0108b0e1f0
+EBUILD networkmanager-1.26.0-r1.ebuild 11208 BLAKE2B f69905ebe2031f6e707c9c1907e03f0c80fdb2546bec7964a9b21b3a8a6008c023a630e9cfbca5cef00ff937056d816755d62884428fc972814ac67cee755a51 SHA512 40009fa98e7a6317d87a22e8ab559e70d229bdbd0bfc91e49cfcff36f5bc551d86d16f9fdd2e52e3e2821123dd47eb4e3efb0a79d873a91d34eefcbaf9c50e2d
+EBUILD networkmanager-1.26.2-r1.ebuild 11214 BLAKE2B b9bf75442380146f2b7eb73f8022cbd30eaecb47e9f48ab96300e26471ecfa1949f076749b23604cc8c5b34264858788cf638c74221bbc5bef2d04e0f219e19d SHA512 eb92e2db85fb28e961494c6425eab2f3a03d61c4efa94d5cdbf1393b7f4d90e55b6cc958f2ec7c0079250f8a51827d42a477ec459bffaa508e6817f4ab8c0d12
+EBUILD networkmanager-1.26.4.ebuild 11359 BLAKE2B f129d1aa0f60a115786e6833fd6cfa43f7b28174fd83cf74c09db9fb69222235e2a424ea8a0993bf4ca14dd24f5e942961f2780a1fdb6806a0ead0f616a6fae7 SHA512 2568a02a564e5be9135880e6e80d587eae81fccbf1469c78830f3580da69ab02d6090a0371697919d39082da6ef50c6a35aeb1318fa7c25a1159c321767a677c
+MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch b/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch
deleted file mode 100644
index 12c8b873e6a1..000000000000
--- a/net-misc/networkmanager/files/1.18.4-iwd1-compat.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 59923ad85d1a1cf2216a4f14649702d24d3f2360 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Sat, 2 Nov 2019 06:55:54 +0100
-Subject: [PATCH 1/2] iwd: add some missing error handling
-
-g_dbus_object_manager_get_interface() can happily return NULL and we
-need to check for that.
----
- src/devices/wifi/nm-iwd-manager.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
-index dd1cad480..e83f8063c 100644
---- a/src/devices/wifi/nm-iwd-manager.c
-+++ b/src/devices/wifi/nm-iwd-manager.c
-@@ -136,6 +136,11 @@ agent_dbus_method_cb (GDBusConnection *connection,
- 	network = g_dbus_object_manager_get_interface (priv->object_manager,
- 	                                               network_path,
- 	                                               NM_IWD_NETWORK_INTERFACE);
-+	if (!network) {
-+		_LOGE ("unable to find the network object");
-+		return;
-+	}
-+
- 
- 	device_path = get_property_string_or_null (G_DBUS_PROXY (network), "Device");
- 	if (!device_path) {
-@@ -260,6 +265,11 @@ register_agent (NMIwdManager *self)
- 	                                                     "/",
- 	                                                     NM_IWD_AGENT_MANAGER_INTERFACE);
- 
-+	if (!agent_manager) {
-+		_LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work");
-+		return;
-+	}
-+
- 	/* Register our agent */
- 	g_dbus_proxy_call (G_DBUS_PROXY (agent_manager),
- 	                   "RegisterAgent",
--- 
-2.20.1
-
-
-From 186d22a9634e2bf94658ed6f1cf2b332ecb3a32c Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Sat, 2 Nov 2019 07:01:28 +0100
-Subject: [PATCH 2/2] iwd: unbreak iwd-1.0
-
-The upstream apparently thought it's a great idea to change the agent
-manager path. This fixes things for those unfortunate enough to run
-IWD.
----
- src/devices/wifi/nm-iwd-manager.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
-index e83f8063c..470cb1c90 100644
---- a/src/devices/wifi/nm-iwd-manager.c
-+++ b/src/devices/wifi/nm-iwd-manager.c
-@@ -262,9 +262,17 @@ register_agent (NMIwdManager *self)
- 	GDBusInterface *agent_manager;
- 
- 	agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
--	                                                     "/",
-+	                                                     "/net/connman/iwd",
- 	                                                     NM_IWD_AGENT_MANAGER_INTERFACE);
- 
-+	if (!agent_manager) {
-+		/* IWD prior to 1.0 dated 30 October, 2019 has the agent manager on a
-+		 * different path. */
-+		agent_manager = g_dbus_object_manager_get_interface (priv->object_manager,
-+		                                                     "/",
-+		                                                     NM_IWD_AGENT_MANAGER_INTERFACE);
-+	}
-+
- 	if (!agent_manager) {
- 		_LOGE ("unable to register the IWD Agent: PSK/8021x Wi-Fi networks may not work");
- 		return;
--- 
-2.20.1
-
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r1 b/net-misc/networkmanager/files/init.d.NetworkManager-r1
deleted file mode 100644
index 3209644c511f..000000000000
--- a/net-misc/networkmanager/files/init.d.NetworkManager-r1
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
-# Copyright 2013-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="NetworkManager daemon. The service is marked as started only \
-when a network connection is established."
-
-depend() {
-	need dbus
-	use consolekit
-	provide net
-}
-
-start() {
-	# If we are re-called by a dispatcher event, we want to mark the service
-	# as started without starting the daemon again
-	yesno "${IN_BACKGROUND}" && return 0
-
-	[ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1"
-
-	ebegin "Starting NetworkManager"
-	start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \
-		--exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid
-	local _retval=$?
-	eend "${_retval}"
-	if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then
-		einfo "Marking NetworkManager as inactive. It will automatically be marked"
-		einfo "as started after a network connection has been established."
-		mark_service_inactive
-	fi
-	return "${_retval}"
-}
-
-stop() {
-	# If we are re-called by a dispatcher event, we want to mark the service
-	# as inactive without stopping the daemon
-	if yesno "${IN_BACKGROUND}"; then
-		mark_service_inactive "${SVCNAME}"
-		return 0
-	fi
-
-	ebegin "Stopping NetworkManager"
-	local pidfile=/run/NetworkManager/NetworkManager.pid
-	if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then 
-		# Try stopping the pid file used by <0.9.7
-		pidfile=/var/run/NetworkManager.pid
-		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
-		ret=$?
-		[ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}"
-		eend ${ret}
-	else
-		start-stop-daemon --stop --quiet --pidfile "${pidfile}"
-		eend $?
-	fi
-}
-
-# vim: set ft=gentoo-init-d ts=4 :
diff --git a/net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch b/net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch
new file mode 100644
index 000000000000..b3b63758d697
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.26.4-iwd-fixes-pr640.patch
@@ -0,0 +1,169 @@
+Backport of https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/640
+
+--- a/src/devices/wifi/nm-device-iwd.c
++++ b/src/devices/wifi/nm-device-iwd.c
+@@ -1905,38 +1905,39 @@ schedule_periodic_scan (NMDeviceIwd *self, gboolean initial_scan)
+ {
+ 	NMDeviceIwdPrivate *priv = NM_DEVICE_IWD_GET_PRIVATE (self);
+ 	GVariant *value;
+-	gboolean disconnected;
++	gboolean disconnected = TRUE;
+ 	guint interval;
+ 
+-	if (!priv->can_scan || priv->scan_requested)
+-		return;
+-
+-	value = g_dbus_proxy_get_cached_property (priv->dbus_station_proxy, "State");
+-	disconnected = nm_streq0 (get_variant_state (value), "disconnected");
+-	g_variant_unref (value);
++	if (priv->can_scan) {
++		value        = g_dbus_proxy_get_cached_property (priv->dbus_station_proxy, "State");
++		disconnected = nm_streq0 (get_variant_state (value), "disconnected");
++		g_variant_unref (value);
++	}
+ 
+ 	/* Start scan immediately after a disconnect, mode change or
+-	 * device UP, otherwise wait a period dependent on the current
+-	 * state.
++	 * device UP, otherwise wait 10 seconds.  When connected, update
++	 * AP list mainly on UI requests.
+ 	 *
+ 	 * (initial_scan && disconnected) override priv->scanning below
+ 	 * because of an IWD quirk where a device will often be in the
+ 	 * autoconnect state and scanning at the time of our initial_scan,
+-	 * but our logic will the send it a Disconnect() causeing IWD to
++	 * but our logic will then send it a Disconnect() causing IWD to
+ 	 * exit autoconnect and interrupt the ongoing scan, meaning that
+ 	 * we still want a new scan ASAP.
+ 	 */
+-	if (initial_scan && disconnected)
++	if (!priv->can_scan || !disconnected || priv->scan_requested || priv->scanning)
++		interval = -1;
++	else if (initial_scan)
+ 		interval = 0;
+-	else if (!priv->periodic_scan_id && !priv->scanning)
+-		interval = disconnected ? 10 : 20;
++	else if (!priv->periodic_scan_id)
++		interval = 10;
+ 	else
+ 		return;
+ 
+ 	nm_clear_g_source (&priv->periodic_scan_id);
+-	priv->periodic_scan_id = g_timeout_add_seconds (interval,
+-	                                                periodic_scan_timeout_cb,
+-	                                                self);
++
++	if (interval != (guint) -1)
++		priv->periodic_scan_id = g_timeout_add_seconds (interval, periodic_scan_timeout_cb, self);
+ }
+ 
+ static void
+@@ -2331,7 +2332,6 @@ powered_changed (NMDeviceIwd *self, gboolean new_powered)
+ 		update_aps (self);
+ 	} else {
+ 		set_can_scan (self, FALSE);
+-		nm_clear_g_source (&priv->periodic_scan_id);
+ 		priv->scanning = FALSE;
+ 		priv->scan_requested = FALSE;
+ 		priv->can_connect = FALSE;
+@@ -2537,17 +2537,7 @@ dispose (GObject *object)
+ 
+ 	nm_clear_g_cancellable (&priv->cancellable);
+ 
+-	nm_clear_g_source (&priv->periodic_scan_id);
+-
+-	cleanup_association_attempt (self, TRUE);
+-
+-	g_clear_object (&priv->dbus_device_proxy);
+-	g_clear_object (&priv->dbus_station_proxy);
+-	g_clear_object (&priv->dbus_ap_proxy);
+-	g_clear_object (&priv->dbus_adhoc_proxy);
+-	g_clear_object (&priv->dbus_obj);
+-
+-	remove_all_aps (self);
++	nm_device_iwd_set_dbus_object(self, NULL);
+ 
+ 	G_OBJECT_CLASS (nm_device_iwd_parent_class)->dispose (object);
+ 
+--- a/src/devices/wifi/nm-iwd-manager.c
++++ b/src/devices/wifi/nm-iwd-manager.c
+@@ -622,6 +622,38 @@ interface_removed (GDBusObjectManager *object_manager, GDBusObject *object,
+ 	}
+ }
+ 
++static void
++object_added(GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data)
++{
++    GList *interfaces, *iter;
++
++    interfaces = g_dbus_object_get_interfaces(object);
++
++    for (iter = interfaces; iter; iter = iter->next) {
++        GDBusInterface *interface = G_DBUS_INTERFACE(iter->data);
++
++        interface_added(NULL, object, interface, user_data);
++    }
++
++    g_list_free_full(interfaces, g_object_unref);
++}
++
++static void
++object_removed(GDBusObjectManager *object_manager, GDBusObject *object, gpointer user_data)
++{
++    GList *interfaces, *iter;
++
++    interfaces = g_dbus_object_get_interfaces(object);
++
++    for (iter = interfaces; iter; iter = iter->next) {
++        GDBusInterface *interface = G_DBUS_INTERFACE(iter->data);
++
++        interface_removed(NULL, object, interface, user_data);
++    }
++
++    g_list_free_full(interfaces, g_object_unref);
++}
++
+ static void
+ connection_removed (NMSettings *settings,
+                     NMSettingsConnection *sett_conn,
+@@ -682,22 +714,6 @@ _om_has_name_owner (GDBusObjectManager *object_manager)
+ 	return !!name_owner;
+ }
+ 
+-static void
+-object_added (NMIwdManager *self, GDBusObject *object)
+-{
+-	GList *interfaces, *iter;
+-
+-	interfaces = g_dbus_object_get_interfaces (object);
+-
+-	for (iter = interfaces; iter; iter = iter->next) {
+-		GDBusInterface *interface = G_DBUS_INTERFACE (iter->data);
+-
+-		interface_added (NULL, object, interface, self);
+-	}
+-
+-	g_list_free_full (interfaces, g_object_unref);
+-}
+-
+ static void
+ release_object_manager (NMIwdManager *self)
+ {
+@@ -836,12 +852,16 @@ got_object_manager (GObject *object, GAsyncResult *result, gpointer user_data)
+ 		                  G_CALLBACK (interface_added), self);
+ 		g_signal_connect (priv->object_manager, "interface-removed",
+ 		                  G_CALLBACK (interface_removed), self);
++		g_signal_connect (priv->object_manager, "object-added",
++		                  G_CALLBACK(object_added), self);
++		g_signal_connect (priv->object_manager, "object-removed",
++		                  G_CALLBACK(object_removed), self);
+ 
+ 		g_hash_table_remove_all (priv->known_networks);
+ 
+ 		objects = g_dbus_object_manager_get_objects (object_manager);
+ 		for (iter = objects; iter; iter = iter->next)
+-			object_added (self, G_DBUS_OBJECT (iter->data));
++			object_added (NULL, G_DBUS_OBJECT(iter->data), self);
+ 
+ 		g_list_free_full (objects, g_object_unref);
+ 
diff --git a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch b/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch
deleted file mode 100644
index 1b94ab478d8b..000000000000
--- a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27d380b70ea839c7badab420361e4e65e023e8e9 Mon Sep 17 00:00:00 2001
-From: Lubomir Rintel <lkundrak@v3.sk>
-Date: Fri, 16 Aug 2019 13:22:09 +0200
-Subject: [PATCH] data: fix the ID_NET_DRIVER udev rule
-
-Systemd v243 is complaining about the wrong substitution there. That is
-sort of harmless, because systemd-udevd in that version doesn't need the
-rule anyway. But still fix it, to avoid a warning.
-
-Also, newer udevd's $PATH doesn't include sbin. That is also okay,
-because we don't need the rule to actually work there. But fix it
-anyway.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1740655
----
- data/84-nm-drivers.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
-index d246ef6ce..e398cb9f2 100644
---- a/data/84-nm-drivers.rules
-+++ b/data/84-nm-drivers.rules
-@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
- # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
- ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
- DRIVERS=="?*", GOTO="nm_drivers_end"
--PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
-+PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
- 
- LABEL="nm_drivers_end"
--- 
-2.21.0
-
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 91e9ff45256e..808f71c51288 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -9,8 +9,6 @@
 		<flag name="concheck">Enable connectivity checking support</flag>
 		<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and
 			<pkg>net-firewall/iptables</pkg> for connection sharing</flag>
-		<flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session
-			tracking</flag>
 		<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for
 			getting ip</flag>
 		<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip</flag>
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
deleted file mode 100644
index 453af4ab92ad..000000000000
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-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="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	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}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch
-	"${FILESDIR}"/${PV}-iwd1-compat.patch # included in 1.21.3+
-)
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_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} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	# Empty
-	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
deleted file mode 100644
index 070ae215d272..000000000000
--- a/net-misc/networkmanager/networkmanager-1.18.6.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
-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="
-	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	policykit? ( >=sys-auth/polkit-0.106 )
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.24
-	net-misc/iputils
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	audit? ( sys-process/audit )
-	bluetooth? ( >=net-wireless/bluez-5 )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		net-firewall/iptables )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( net-misc/dhcpcd )
-	elogind? ( >=sys-auth/elogind-219 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
-	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
-	ncurses? ( >=dev-libs/newt-0.52.15 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	!nss? ( gnutls? (
-		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
-	ofono? ( net-misc/ofono )
-	ovs? ( dev-libs/jansson )
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	resolvconf? ( net-dns/openresolv )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-209:0= )
-	teamd? (
-		dev-libs/jansson
-		>=net-misc/libteam-1.9
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-3.18
-	virtual/pkgconfig
-	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}]')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch
-	"${FILESDIR}"/1.18.4-iwd1-compat.patch # included in 1.21.3+
-)
-
-python_check_deps() {
-	if use introspection; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--disable-lto
-		--disable-config-plugin-ibft
-		--disable-qt
-		--without-netconfig
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
-		# still not ready for removing that lib, bug #665338
-		--with-libnm-glib
-		$(multilib_native_with nmcli)
-		--with-udev-dir="$(get_udevdir)"
-		--with-config-plugins-default=keyfile
-		--with-iptables=/sbin/iptables
-		--with-ebpf=yes
-		$(multilib_native_enable concheck)
-		--with-crypto=$(usex nss nss gnutls)
-		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
-		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
-		$(multilib_native_use_with audit libaudit)
-		$(multilib_native_use_enable bluetooth bluez5-dun)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(multilib_native_use_enable introspection)
-		$(use_enable json json-validation)
-		$(multilib_native_use_enable ppp)
-		--without-libpsl
-		$(multilib_native_use_with modemmanager modem-manager-1)
-		$(multilib_native_use_with ncurses nmtui)
-		$(multilib_native_use_with ofono)
-		$(multilib_native_use_enable ovs)
-		$(multilib_native_use_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} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		local targets=(
-			libnm/libnm.la
-			libnm-util/libnm-util.la
-			libnm-glib/libnm-glib.la
-			libnm-glib/libnm-glib-vpn.la
-		)
-		emake "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx emake check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		# Install completions at proper place, bug #465100
-		gnome2_src_install completiondir="$(get_bashcompdir)"
-		insinto /usr/lib/NetworkManager/conf.d #702476
-		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-	else
-		local targets=(
-			install-libLTLIBRARIES
-			install-libdeprecatedHEADERS
-			install-libnm_glib_libnmvpnHEADERS
-			install-libnm_glib_libnmincludeHEADERS
-			install-libnm_util_libnm_util_includeHEADERS
-			install-libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmincludeHEADERS
-			install-nodist_libnm_glib_libnmvpnHEADERS
-			install-nodist_libnm_util_libnm_util_includeHEADERS
-			install-nodist_libnmincludeHEADERS
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${targets[@]}"
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-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
-}
diff --git a/net-misc/networkmanager/networkmanager-1.20.12.ebuild b/net-misc/networkmanager/networkmanager-1.20.12.ebuild
deleted file mode 100644
index 81c6f70ed900..000000000000
--- a/net-misc/networkmanager/networkmanager-1.20.12.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# 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
-	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.10-r11.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
index b2cd3babde33..7fb85f509cd4 100644
--- a/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.22.10-r12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/
 LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audit bluetooth +concheck connection-sharing consolekit +dhclient dhcpcd "
+IUSE="audit bluetooth +concheck connection-sharing +dhclient dhcpcd "
 IUSE+="debug elogind examples +gnutls gtk-doc introspection iwd json kernel_linux "
 IUSE+="libpsl lto modemmanager nss ofono ovs +policykit ppp resolvconf selinux "
 IUSE+="syslog systemd teamd test +tools vala wext +wifi"
@@ -24,7 +24,7 @@ REQUIRED_USE="
 	iwd? ( wifi )
 	vala? ( introspection )
 	^^ ( gnutls nss )
-	?? ( consolekit elogind systemd )
+	?? ( elogind systemd )
 	?? ( dhclient dhcpcd )
 	?? ( syslog systemd )
 "
@@ -43,7 +43,6 @@ DEPEND="
 		net-dns/dnsmasq[dbus,dhcp]
 		net-firewall/iptables
 	)
-	consolekit? ( sys-auth/consolekit )
 	dhclient? ( net-misc/dhcp[client] )
 	dhcpcd? ( net-misc/dhcpcd )
 	elogind? ( sys-auth/elogind )
@@ -235,11 +234,7 @@ src_configure() {
 		$(meson_use lto b_lto)
 	)
 
-	if use consolekit; then
-		emesonargs+=( -D session_tracking_consolekit=true )
-		emesonargs+=( -D session_tracking=no )
-		emesonargs+=( -D suspend_resume=consolekit )
-	elif use systemd; then
+	if use systemd; then
 		emesonargs+=( -D session_tracking_consolekit=false )
 		emesonargs+=( -D session_tracking=systemd )
 		emesonargs+=( -D suspend_resume=systemd )
diff --git a/net-misc/networkmanager/networkmanager-1.24.2.ebuild b/net-misc/networkmanager/networkmanager-1.24.2.ebuild
deleted file mode 100644
index 91ce0e3aeda7..000000000000
--- a/net-misc/networkmanager/networkmanager-1.24.2.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# 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
-	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/networkmanager/networkmanager-1.26.0.ebuild b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
index e3cf77c51fed..021a54dfe6ac 100644
--- a/net-misc/networkmanager/networkmanager-1.26.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.0-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="audit bluetooth connection-sharing 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="
@@ -24,7 +24,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 	wext? ( wifi )
 	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
+	?? ( elogind systemd )
 "
 
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	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 )
@@ -177,9 +176,11 @@ multilib_src_configure() {
 		$(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.
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
 		--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)
diff --git a/net-misc/networkmanager/networkmanager-1.26.2.ebuild b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
index 91ce0e3aeda7..3c513d596fc9 100644
--- a/net-misc/networkmanager/networkmanager-1.26.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.2-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="audit bluetooth connection-sharing 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="
@@ -24,7 +24,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 	wext? ( wifi )
 	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
+	?? ( elogind systemd )
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	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 )
@@ -177,9 +176,11 @@ multilib_src_configure() {
 		$(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.
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
 		--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)
diff --git a/net-misc/networkmanager/networkmanager-1.22.14.ebuild b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
index c7d5376f75d7..97f5b8ad96b3 100644
--- a/net-misc/networkmanager/networkmanager-1.22.14.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.26.4.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="audit bluetooth connection-sharing 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="
@@ -24,7 +24,7 @@ REQUIRED_USE="
 	vala? ( introspection )
 	wext? ( wifi )
 	|| ( nss gnutls )
-	?? ( consolekit elogind systemd )
+	?? ( elogind systemd )
 "
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	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 )
@@ -101,6 +100,8 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-1.26.4-iwd-fixes-pr640.patch )
+
 python_check_deps() {
 	if use introspection; then
 		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
@@ -157,6 +158,11 @@ src_prepare() {
 
 	use vala && vala_src_prepare
 	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
 }
 
 multilib_src_configure() {
@@ -177,9 +183,11 @@ multilib_src_configure() {
 		$(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.
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
 		--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)
@@ -196,7 +204,6 @@ multilib_src_configure() {
 		$(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)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index d7a6b0ab679b..dfe76fb50596 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,10 +1,8 @@
 AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
-DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
-DIST nextcloud-client-3.0.1.tar.gz 19059671 BLAKE2B c85f9d1627a75745c5a450b1c59799716c17dad3ba5ce277a62bebbbb80f243236cb4d529ff8ce4af9371c7ab1948b5a86dfaa3fbeb9de8681c9df0f397044f7 SHA512 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5
 DIST nextcloud-client-3.0.2.tar.gz 19114545 BLAKE2B a6aa041708d110fbdca082476e65ccc8fec189948aa64020a27beabe2d7b3df474ae3313b5aef0e15f3498cf974cf414eb4934417cea206b021e4e212351a088 SHA512 188f878457baba14f01ca6c0f83100bcc64feaf5e3da86903d59d8b7c553c89f88252c1410cd153952950f91429af680b1901f3f9de951bfd06a06c176d44e7d
-EBUILD nextcloud-client-2.6.5.ebuild 2013 BLAKE2B d2108ce06b9c25a56a13852fa5c8809217db7537346bb803311f5c034f483bcd050b8cb617c9bacde98b9e012cd91a2f130aa471b4190e013dca263080bef290 SHA512 338a289d30bbfb89619805425032142052860d86f415338d5e66e13ca05d6ca02d0ef0a41a41e5d889ce7ced734dc9a5ac50bfad6d00ed8b1e9fdaa0fc05df4d
-EBUILD nextcloud-client-3.0.0.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
-EBUILD nextcloud-client-3.0.1.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
-EBUILD nextcloud-client-3.0.2.ebuild 2088 BLAKE2B ad2d12f37cfc2d314b9b5a310eef4772874da94bf21385c1361d9cc1be8b9c6ff4787d94c1d7ea8b3dc1f015d68ff8acf21c8e894727413ae04e728fff683a36 SHA512 3e9d8be0cedb7549051b33b80aa85f17599e5cdd67d32b42aae1e17b223c9a0eb55c5eac14102ee4474e921ebb7aed3b43b100fb9d267c40b3ba91a96361b450
-MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
+DIST nextcloud-client-3.0.3.tar.gz 19202718 BLAKE2B b5e09be514ede6e323e9624df38aad10969c0fdae7bc7baaeb9da4628dfa1c44a4fb6b5f6b4b83ff92b0eedbbe1ffbcf54da43d5e71923979b8649db54b05d7c SHA512 aa9e9897dae74919f11817f8aad139378a2a26df6663f3c9ee9c9e1d229b537daa9e9ed9f3ba292f8e299017f7ef5d863257a26858af159e7e76c7247d7c244d
+EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6
+EBUILD nextcloud-client-3.0.2.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
+EBUILD nextcloud-client-3.0.3.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
+MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index 4342ef68dc63..dfcd23fb500c 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
-		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nextcloud/desktop</remote-id>
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
index 52cdf94f2165..43b18edfd8e8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc dolphin nautilus shibboleth test"
+IUSE="doc dolphin nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	>=dev-libs/openssl-1.1.0:0=
@@ -31,8 +31,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
+	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
@@ -74,8 +73,8 @@ src_configure() {
 		-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)
+		-DNO_SHIBBOLETH=yes
 	)
 
 	cmake_src_configure
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
deleted file mode 100644
index b6dc27e09eaa..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg: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 )"
-
-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_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_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-3.0.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
index 2c3d246de4b1..a3dd780f6e5f 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin libressl nautilus shibboleth test"
+IUSE="doc dolphin libressl nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-libs/qtkeychain[qt5(+)]
@@ -35,8 +35,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	)
 	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 	libressl? ( >=dev-libs/libressl-3.1:0= )
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
+	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
@@ -75,7 +74,7 @@ src_configure() {
 		-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)
+		-DNO_SHIBBOLETH=yes
 		-DUNIT_TESTING=$(usex test)
 	)
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.3.ebuild
index b6dc27e09eaa..a3dd780f6e5f 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.0.3.ebuild
@@ -12,10 +12,9 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
+IUSE="doc dolphin libressl nautilus 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
@@ -34,8 +33,9 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
+	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+	libressl? ( >=dev-libs/libressl-3.1:0= )
+	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
@@ -74,7 +74,7 @@ src_configure() {
 		-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)
+		-DNO_SHIBBOLETH=yes
 		-DUNIT_TESTING=$(usex test)
 	)
 
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index c2c262e5084f..9ea8ad5fb105 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -7,12 +7,13 @@ AUX ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch 736 BLAKE2B 6318
 AUX ntpsec-1.1.8-externalize-sys_maxclock-fix-for-bug-708522.patch 854 BLAKE2B dc063775eee0248e24c174056581979582dd1dbc4e4fd0901add3f26b63cbb342469598f1fd2be8af8c1da561c1f225349cec258fcfb4af9355d47e33bcf77eb SHA512 a5c6d652c4d696af126f199df7ec1e8a9c33f55b3a0d02b5576898d34016780f51e06aa4e0e84a1d2862f57d08fd4285dd0888bac5aac9fec94c26a2e9b99043
 AUX ntpsec-1.1.8-fix-asciidoc-version-detect.patch 14369 BLAKE2B 5f2152463b0a551202f07b535bcd14ef8a94a599643ab5e6dedf481eacc97ba7f8e7491ead10473b2988b07cef41a65c6c3612b564a155df4a01fb6df7bdb0db SHA512 b171e5b0f3f493db6a2d10b0e9ecacf3cd8b6ed49f363d431c8d4a5fc3314acdbc4c82882967f4ef72193c6e3851a3aed5d667820175f75e43b413a277f31a19
 AUX ntpsec-1.1.8-fix-missing-scmp_sys-on-aarch64.patch 536 BLAKE2B cac17041a05d0ec22b8d95dbb16118d7603c74a7d4c873422de65451f5ddd74b7d9aceb51714d842ef7c4a37ea638212487d6db99ebfa201b01b9654b732538c SHA512 c54b3304ca467e8434e29d312e5839c788becd8ae9068737ec9725a42f22073ea0e86355999dc6d606c12f4c733497cbe48bd49b6e150c39e6540e581df6087e
+AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
 DIST ntpsec-1.1.9.tar.gz 2606066 BLAKE2B bbc482333c7f86936fa20751df1b427bc24be159969050caf5751e26724714bbf6491b120986563497f015c96ac9cdbdf0e999c6446a68798aff23076f631ecc SHA512 e04267aa675a5b528f3478d00329a569ecb9bbe2b6ad18697020854d2ee451bc188c4603cd5f420a08a7e3bf047d2db1301416f57f9156df23aceb1f57303b0b
 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-1.1.9.ebuild 4053 BLAKE2B f5b5015d72999c7f30053bd20a3bea86ccc7190d55a435b77d6b3dc6832843ee2e502251987c3a6aab527fb79b0fe56f6ee41ea9c3f3d789c98e27a2703ff62e SHA512 a655d1b47f0225bef39bd15d1b1501caf7e26e5232a606fbf18bfb81625a0877ac618f1bb2dd2a5be2cb52e9122bddcbae8a868ee9c829ed30f23d03b6371764
+EBUILD ntpsec-1.1.9.ebuild 4197 BLAKE2B 956af55af711b07390c1d600a6b3ad6b4ddd3effdd0f295c85e4b7a1c0ec3b9fd70286a772140afb4cb94fd292ae5be2fc843dad6e7fd34cc2dfc2b92eae4be8 SHA512 ed39608122eb5d414ddabc35e63676d40e0b1d0375247442a9a19383c0069f37530c1985d6cd3589a05468e16418464d5e53a6c6482998ea28f968e77730a2a6
 EBUILD ntpsec-9999.ebuild 4056 BLAKE2B c47d9c0fe4c01f1d66f1dc115f801cf95a6d8a7646f621c6e127b898581eb211520ea63e2eef43999039c32d6cc2eafd15fe8721ef4a5484e3528658ab11385f SHA512 c64b7cac7418191e75aa827e800f535a193165f5395215ffa3aca99a6ed0675d5a5c060eb5a3ed662882f2b3911977b918fe9366b49c7a7053f2f186ec60c1d5
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
new file mode 100644
index 000000000000..1f483ce33fbd
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.1.9-remove-asciidoctor-from-config.patch
@@ -0,0 +1,14 @@
+--- a/wafhelpers/asciidoc.py	2020-10-06 20:14:47.040245129 -0700
++++ b/wafhelpers/asciidoc.py	2020-10-06 20:17:48.100394117 -0700
+@@ -37,9 +37,9 @@
+     # asciidoc versions 8.6.5-8.6.7 throw warnings for warp.adoc and versions
+     # < 8.6.4 have no HTML5 backend.
+     # asciidoc3 versions < 3.0.2 throw errors.
+-    adoc_list = [['asciidoctor', (1, 5, 8)],
+-                 ['asciidoc', (8, 6, 8)],
++    adoc_list = [['asciidoc', (8, 6, 8)],
+                  ['asciidoc3', (3, 0, 2)],
++                 ['asciidoctor-bad', (1, 5, 8)],
+                  ]
+     for progname, asciidocminver in adoc_list:
+         if 'BIN_ASCIIDOC' not in ctx.env or ctx.env.BIN_ASCIIDOC == []:
diff --git a/net-misc/ntpsec/ntpsec-1.1.9.ebuild b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
index 1af747e2e914..51381f4b16be 100644
--- a/net-misc/ntpsec/ntpsec-1.1.9.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.9.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}
 	acct-user/ntp
 "
 DEPEND="${CDEPEND}
-	app-text/asciidoc
+	>=app-text/asciidoc-8.6.8
 	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
@@ -56,6 +56,11 @@ DEPEND="${CDEPEND}
 	rclock_pps? ( net-misc/pps-tools )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.8-fix-missing-scmp_sys-on-aarch64.patch"
+	"${FILESDIR}/${P}-remove-asciidoctor-from-config.patch"
+)
+
 WAF_BINARY="${S}/waf"
 
 src_prepare() {
@@ -87,7 +92,7 @@ src_configure() {
 		--nopyo
 		--refclock="${CLOCKSTRING}"
 		--build-epoch="$(date +%s)"
-		$(use doc	&& echo "--enable-doc")
+		$(use doc	|| echo "--disable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
 		$(use samba	&& echo "--enable-mssntp")
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 2f8dbc02fa84..5e3cd3c204f6 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -2,8 +2,10 @@ DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0
 DIST nx-libs-3.5.99.22-full.tar.gz 5280116 BLAKE2B 1a15ba04ace5fd46b007652897aa911a883fa2840c07f4e89db970d3235556ee83600f5cd4d9c4b64f7ce4767dd448a3654412051496754d73a2815a7573692f SHA512 53e7f1ffd8bf9dfd08426e30b0a18433b64f926959ab95132c28960f9a2390e67a34b1e07c923bf11f889088711d7d97c1fd123507f39c2077211d2c3cd6857f
 DIST nx-libs-3.5.99.23.tar.gz 11073366 BLAKE2B 0e06e9c90f73a0264d8363ee3f75914ada884f469d9ba15b062675625a9922be5ec963eb7611484ef2abea83a100e58b05e6421da67d8b5c5f840737e6b37321 SHA512 b627d521f7a3c43c9c000f770bd1e228842099e794cda32b37df621ac86c650990bdc69810b7ff6117cbd60f0339dda93d1e2acdcfac03ddaa50407d71668b60
 DIST nx-libs-3.5.99.24.tar.gz 11059384 BLAKE2B 79879991c2c0127e43975d42a27159594e3be29b2e358576da4bdc17ef1dc0c27a31c85b12a8c55638abb99db9f7f1fad4f4d8794c01e1327a5cb68558073fc0 SHA512 755f9065da69f0057a7284eb80f214cd272c6753f32ddaa17b4258c6ccba77c8fec82eafaea87bd3e055610dc798cb141d8e947900ad3bad34c681df664df3b2
+DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
 EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
 EBUILD nx-3.5.99.22.ebuild 3243 BLAKE2B 96efb3e409b0e6253efcc1914ae5bf5d1020999e682a729dee71c188126aed73b9abbbf62b1cfae46427c1a65c0365c94e5d321c825b4775df0b5a06ff17ffd6 SHA512 159ee29ca7dc9a1d8ee12ee5fea8a10a0bb1ac28762d08208dc15b547e8d4d15b06de001e13f36c8648c193155ba1865f02d05be7d8bf25b228f889fd509711e
 EBUILD nx-3.5.99.23.ebuild 3392 BLAKE2B 676f533494f67fe8285db1d5a4ddd715c58ae7ce78d4cf7e4bc63d330709735c1d814426cdf80303a6420686deed5be75d3d82b2d0fc65fc4e9b04052207890a SHA512 a4020facae074b7f123c165e2009d4c1b7dcf3e33c2b1917dbfd80fc5d210c0cc93886158cfc4fb8153752a9e368910bfb750eab4a43b182581c9b4645a8aa56
 EBUILD nx-3.5.99.24.ebuild 3263 BLAKE2B 586b19ad301450226ad97666e6f8f3f07cd060f8778c1437c863876af725e29811910508345300b400cb4513861295f0f09b81fc5768f2d3452e968f2b3b3b05 SHA512 0372380455f94e9aa723c00793836b47671c6d184afd640a7a39120d6de2df54c9b0fd80577a426a460d24bd7e21541d5cab7b43b7d6c70d9113d85748776364
+EBUILD nx-3.5.99.25.ebuild 3263 BLAKE2B 586b19ad301450226ad97666e6f8f3f07cd060f8778c1437c863876af725e29811910508345300b400cb4513861295f0f09b81fc5768f2d3452e968f2b3b3b05 SHA512 0372380455f94e9aa723c00793836b47671c6d184afd640a7a39120d6de2df54c9b0fd80577a426a460d24bd7e21541d5cab7b43b7d6c70d9113d85748776364
 MISC metadata.xml 332 BLAKE2B 93930f64047301f8a393899de54a0d9294c7c17385b47fec5a2e402b2904bc88ae697e5b075e1defd723d8d251fd424e790e9b37b94bc48b10b395307e3830fd SHA512 005c90731093f7fc354297e981140415e33785492a1a835a5a5b8b68506d690679d6430ff0b05f6e3ce2ac763ea13cd68a599581a6037f16ac1974e6ad9d54a4
diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild
new file mode 100644
index 000000000000..f910dec05f09
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.25.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
+
+SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="dev-libs/libxml2
+	>=media-libs/libpng-1.2.8:0=
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg:*
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXfont2
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pixman"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libfontenc
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+S="${WORKDIR}/nx-libs-${PV}"
+
+src_prepare() {
+	default
+
+	# We want predictable behavior. So let's assume we never
+	# have quilt installed.
+	sed 's@which quilt@false@' -i mesa-quilt || die
+
+	# Do not compress man pages by default
+	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
+
+	# run autoreconf in all needed folders
+	local subdir
+	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		eautoreconf
+		popd || die
+	done
+}
+
+src_configure() {
+	# From xorg-x11-6.9.0-r3.ebuild
+	pushd nx-X11 || die
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	# Disable SunRPC, #370767
+	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
+	popd || die
+
+	local subdir
+	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
+		pushd ${subdir} || die
+		econf
+		popd || die
+	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
+}
+
+src_compile() {
+	# First set up the build environment
+	emake build-env
+
+	# We replicate the "build-full" make target here because
+	# we cannot call "make build-full" as it
+	#  - calls autoreconf several times
+	#  - invokes make directly but we prefer our emake
+
+	emake -C nxcomp
+	emake -C nx-X11/lib
+
+	mkdir -p nx-X11/exports/lib/ || die
+	local nxlib
+	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
+		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
+	done
+
+	emake -C nxcompshad
+
+	./mesa-quilt push -a || die
+
+	emake -C nx-X11 BuildDependsOnly
+	# Parallel make issue resurfaced, upstream working on autotools switch
+	emake -j1 -C nx-X11 World \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		SHLIBDIR="/usr/$(get_libdir)"
+
+	emake -C nxproxy
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
+		SHLIBDIR="/usr/$(get_libdir)" \
+		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+		install
+
+	# Already provided by mesa & related packages
+	rm -r "${ED}"/usr/include/GL || die
+
+	# Get rid of libtool files and static libs.
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 5790aa6deffd..5a8ae0671b89 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -5,6 +5,6 @@ AUX oidc-agent-3.3.1_test-suite-buffer-overflows.patch 1526 BLAKE2B ec623853da10
 AUX oidc-agent-3.3.5_makefile-toolchain-vars.patch 1342 BLAKE2B 4d2db2bc1711bcc99b4c7c98677836f80a9fabfb824e33c4affa70eda95188e22f32fc787bbd487d5a4462fce2333119ea5d6208c56acf638c5782f2d1b509f2 SHA512 4775a28c5e29b431238b712b7baa98501be3a3b5c46fcdcfae008665374539cd5192f0af81feeb1c5822d7d46378dd66d0650a0f2cf091d4801493a6a34ac2b4
 DIST oidc-agent-3.3.1.tar.gz 764721 BLAKE2B eea09b3b140ca81be0f3dc8f200120287682ddb328275be35bd736249b72eabb40c87ebd168e51c992ccd4b4a02138e17d3e20f3cebfb4d42bde01351aacead1 SHA512 75428bb52c0cf43256fddd3b33895d7c882ced367543763c68a385448dbe29805ee1fc035f3727e743a607ed4af851ae5db24b40cc6801fc31e45b6fec16bd66
 DIST oidc-agent-3.3.5.tar.gz 766803 BLAKE2B 4998820283d38e3cee76ab7c308075b74da735f6b2c05ed562c5d61006c5ba85f1c44d7e2c0bfb5e4ee60017835ecf331f8b82a45aa5d0105b7933eeec1025a0 SHA512 c58d9e61a99bf870ce4be0e4fde3faa90b8197d0714626412d162c2e09cca18df734a062b792f7fc92323b50677c64df4aeda5ee42a5ea4e44731ad0e15c8030
-EBUILD oidc-agent-3.3.1.ebuild 1480 BLAKE2B 0f4b36ef804e8bcb36f348ce49f2a68a624662eec6458f395e9c8a10ede2af28a6521c41807c42067d8c5dd0aff9e2fa6a7491644a5db082418b11bf9941e362 SHA512 e54e1cfc67d08ff943fcc89f9fa38e9a8f414af084baa8804c0ab2ee6d6a99a084f0a6e7e0be34c8f87ec78ac0a99f6b9ddd4fa80d52ee8f3d273736ada0b10e
-EBUILD oidc-agent-3.3.5-r1.ebuild 1542 BLAKE2B 4f652745197d9c2146a5d1e0b40985f58bdc88d51105c82f5c03927d6b34c64c1b07b51a3a91b8b75adea36240a3ba9906547024c09edc5a8c8e6dd9238bf28c SHA512 b6d223d502492a7c7f3a1227e6110baba3a6b0e5f3dc873401c8de2771101fa7e56837cebd2d50a1120bffe6a6963adf6f5be26c1bd8fb4ec4f841ac84680625
+EBUILD oidc-agent-3.3.1.ebuild 1485 BLAKE2B 14a68d23c070f73bc4919f5b48cb8ca2d6c8e6538da1a79826d9f6f50799d9a7ff056f2f8c52f9d904bbbf1941d5ef5e9df2b1d65e68d00fae7575a6c6fe78be SHA512 796a3eccc59b07f28dcbd6a82d5946028379a17ba68d55f0acf6d2525897ee805a02f6f733b9bcc4688f22b51d3b2ee6c0177e263c6033d10a769508d6f6b3a3
+EBUILD oidc-agent-3.3.5-r1.ebuild 1547 BLAKE2B 1baf0c63e4d2e54cd6c8ac1e311e81e3c04af5b27eb8fa9314ec1dba507f567b0407f07d7d3517487943f0de080f240cc84d05ae1a811cffee38f4c241df3372 SHA512 51a4f0bd8f8263bc1589cd56bdda73eb7f2232c309127dbcdc934aaf1a2c74b78c161b94ada715f91f66c2369e02f91a36ca2b37a73fec29f2f8441ec9def9a1
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
index ca748e52e6d0..2ca56ed3f68e 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic xdg-utils
 
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
 SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
index 5d92fd75b2cc..1a5486a56b56 100644
--- a/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-3.3.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit flag-o-matic xdg-utils
 
-DESCRIPTION="oidc-agent for managing OpenID Connect tokens on the command line"
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
 HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
 SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 97a2f4a69698..9daa20652112 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -8,4 +8,4 @@ EBUILD olsrd-0.9.6.1-r1.ebuild 2337 BLAKE2B c7c96b2ce368d1245b5faab05686eb24ef8e
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
 EBUILD olsrd-0.9.7.ebuild 2315 BLAKE2B f4c37336fcda28419ed3595520122c5e75d748200ae3331bb6546c972a47b5439a76dbd07c9b24fbd6cfbcc23605216c43edde62218dbea9bb89564a995c1ef6 SHA512 a0e7595542b075388398c22eeca02e311ecf9d8b31cf0ef54345f2e75ddf464bd2d4557b29eb6d16ee7fa25ce7ea8857e5dbdd66dbda7a6ca26810f225075287
 EBUILD olsrd-0.9.8.ebuild 2385 BLAKE2B 80f609c1c1a297231670e734a42bb941ff5ea70f45daca826a1c1aa6cae83b9c4665ce491c7a828489425371f13e10d21f09036dd9ed75f02b14b52712b63de5 SHA512 9895cd6623c23fd5213e761803d7974681ddda924a91f9027cd8fd3ccc250764fc1d37e1da26ff4c897a689c1cde798649506ab67c66d8346fcefd30e8d542fa
-MISC metadata.xml 289 BLAKE2B c88d8f719ab7ee520a042f4a45a60a8e797eeede9823b1d21ec5e12700805666e81e96be90b9d961cdbde662ee813a7f68949cc477c40f17ace6902abfc9627e SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520
+MISC metadata.xml 243 BLAKE2B abda82f67bcaba5ce8d982effdcacbe18ac652918f14d3da341781d95cc22f48028d82571b66208263086adcece8809ee7b1f63159250de042766cd6d87efdad SHA512 703cf9330497469fc7feca884347f9b9cba7dd2f36beaf5b9901091eedad49fbd98399f1fab759d198850cffb979df1d2ed87267679afba07dba9f1f7c752226
diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
index 05b0733a9e78..1160ae25593a 100644
--- a/net-misc/olsrd/metadata.xml
+++ b/net-misc/olsrd/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='pud'>Install the Node Position Update plugin</flag>
+<flag name="pud">Install the Node Position Update plugin</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 869e227012d1..0a25c07f15d5 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -6,6 +6,6 @@ DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 EBUILD openntpd-6.0_p1.ebuild 2964 BLAKE2B 3c46ec39de60ac3b58f52b23f3c196077e6bcd2e0c05f5f1f8a218d4a0b64ee87d00db003b2913939df7bcdd5558c2e9c054ecb11cfd648697080e047876ca94 SHA512 b211e867e39bd9b0a52c43cab7f33aece4ca257c18b50d50f3c73a4d87b1d5fb06f3f2a20e55a3c7628d66d12e23fad0740457d5099188f2c06231b7598f1fc7
 EBUILD openntpd-6.2_p3-r1.ebuild 1815 BLAKE2B 7122205d5d6cc366b95a7023d475bb6e9bd403f889e02548056aeaa50c29f62bd70e2b5f27414f54a2e5bb34bc27c646cb23c4d631bacb1f9e84316e46e20e1d SHA512 af6eea8a35f132544bcb47d522353230468e395d283e041543cc65f511f06a7235be08d2a7989edf7ab3019128364f55cc52f012c25f79f6dd5130b2c20c494a
-EBUILD openntpd-6.2_p3-r2.ebuild 1884 BLAKE2B 8c88f18c82e3b7062894d4bab696521e0854245ea1042bb83e973b1c1977cf74e5472c501a3ebe211144564b4b59932677e157aadbf7f37d74d2219abde3ca6f SHA512 2c08fc759450c137915e9be6f43e3208e2408171f1a0b71744032e778e7b32fac903a3c8fa631e2e67d77cebbe052b748cd6ff3fb339c83371a5bff0cd7e9c16
+EBUILD openntpd-6.2_p3-r2.ebuild 1875 BLAKE2B 97cca192fad2b6da1dede9659ab276a5f94b19be7302ddc1c7f377782c5936688af2c7a0d4c6f99efc2e9b5c637aecf2ba01cec79335d8ed7e12c2cd4cd9c134 SHA512 031159fd3892f291f2480b04c875b7a3ed612d8150898a808e04a41d28772205e87f0458e306e8d1c7a4defe51439a5b703ddaec986a2b69623c0e478e3d46da
 EBUILD openntpd-6.2_p3.ebuild 3135 BLAKE2B ad1cf55027141cfe2e571788802f92844f2792d21dc551119760a72de2b7e41cef7aed7028e1071866de828f9cd5b70cb8a214cb16d87b2db26b9147102d7ee7 SHA512 c2f99c14eff42f9ad674b45636cb7b28686adee52d5037a79694356d18770c6d2d9766eece06efe99272f13356bd944b76db650420c9ed1069ca726c6c9cad8a
 MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
index 6f9c04133f6c..799824793a8a 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libressl selinux"
 
 DEPEND="
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 0151a6c4c54a..97314019114c 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -21,6 +21,9 @@ AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f2
 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 openssh-8.3_p1-sha2-include.patch 370 BLAKE2B 3d9ee891d9d647f4ff3b42d47cae4c7a32533bce917b35101fd3c5549717a6b285423894b3372ecb6983d4425c712f4b0590fc95799fd521523d9d74860863c6 SHA512 a1edda5dc43af79e9e4e7d3bcd78cc1c2dbf40e94f22189022dcaf1107c8f2cb2a37c949af5955144f6ada210417a695fe0c4d05d52ba2dbafb1dddf6a1bac3f
+AUX openssh-8.4_p1-X509-glue-12.6.patch 1524 BLAKE2B de9de289b7a401726f92df2e23750df1cb26b3cc9595f1f2db7d74ffacbf4ca2a723d270ffbd0a085d44674375247f34efe04bbbd8150e67a82b6b96b8786065 SHA512 7b301e672cea87ecee89ed1eaea44ac35e2d8395696d7456690308ba1dfe671144488c7b9c79f5a238e2242eae54bca6abadd1ae448ac70cab976930f4ad5f4d
+AUX openssh-8.4_p1-fix-ssh-copy-id.patch 1070 BLAKE2B 2928bc4fbef7d70f57d1f77f4e79238dbe4b640ee891aae94ee767de98fbb04a9421bd9e071771c6d1f9818695ba329058284469ce2f01704b05351989274a1b SHA512 d6088a20e3d4cb597ca99c29fd761e06c16b8a54e7e5d0fa63a07f814fd21e831e0e5e4e3c643b99fe10e536ed98ef5f8179cab2ac79bc44e725327b8d5d5dba
+AUX openssh-8.4_p1-hpn-14.22-X509-glue.patch 4462 BLAKE2B ca35715fd95ec872e39964b499a6415065b291aa25695cc001add8da7687b73700e2c6735e1da21997fac2e31b0767b5cd44d3fcee72f4b5291546034acb1238 SHA512 e61e814646580c59a7acc7dce48250baa0c968869397582a8311ad8138180fbc3154a0bbf056c28ab7d488acf57c7dd0b3c3094bd7e9d78f5a67fdb6e195d064
 AUX openssh-8.4_p1-hpn-14.22-glue.patch 3335 BLAKE2B f5b179aaa82c17f820cdc057de4dbb832bb944668a35d37dc9ca6a390a5d3537026f816e7cb73f9474baa77f81b459af7933d0349eba9585aa9f50139f1d588c SHA512 9b1dff1150230353e7fae31a737b9d1090d3a2017ca04fdc510043fbfb962790b489204e7195f9feff0f4f16732d61ee5804b212776addee6caf7409bb9af017
 AUX openssh-8.4_p1-hpn-14.22-libressl.patch 794 BLAKE2B d204e6030a5cef333065d1c76a75a1e9d2a1a621b910fa6a2d85dc69d236abfa4448030cfb25c3965bf8851609af8f6d5217d04515c4d0ac699a6ce7be6395b6 SHA512 afeabef3df3d4a0f5dd0370477a9eff5e04abad3053e81bd88396956857669fac438474ebacb31dd41da4bb68aeff70dc9ca69f20cdb95c87ecb98d4e5fa2c37
 AUX openssh-8.4_p1-hpn-14.22-sctp-glue.patch 733 BLAKE2B 3262f5293611579202b31540eb4ff6bf24be5bd09a93d10f693b173b61eff371cce0be4ecea2ba873c7d5b250a73c032684345b53a41c369f2a5663ad15ecd41 SHA512 b39a5d76558af51db0e9b1daeaaab3d906a4c941886f8016fb7e5e89177fcd5c81904cb5b3c4d0d5935240bee43d4433ad42495f1aa21771e90013ab7726b6fe
@@ -40,6 +43,7 @@ DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf4
 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.4p1+x509-12.6.diff.gz 857479 BLAKE2B ac8c3e8c1087ca571e5459c9826903410ff2d45de60151d9bd8e59da15805b75752f8f3ffc231c9f8aaa8f2b2c07a97a8296684f885e0d14b54ff5d7bc585588 SHA512 e56516b376ecc3e5464895744ce0616cf4446a891fbd3cbcb090d5f61ebc349d74f9c01e855ccd22e574dbfeec0cb2ba7daf582983010ff991243a6371cc5fe3
 DIST openssh-8.4p1-sctp-1.2.patch.xz 7668 BLAKE2B 2e22d2a90723cea9ef958bd989b8c431fcb08b4dc5bfd3ebbf463ca9546dc37acdc185c35ddf3adbb90bde9b3902bf36524a456061a9bcbdef7a76ece79e2ff4 SHA512 90da34b7b86e52df9e0191c99c9d645a4d4671958adebeed46e1149102d4ba8c729eadb79d84fad9feac64aafa0541d2f1f4db8cdfe0af5ba893aac072ef2380
 DIST openssh-8.4p1.tar.gz 1742201 BLAKE2B 4b1e60d4962095df045c3a31bbf8af725b1c07324c4aa1f6b9a3ddb7e695c98e9aa01655b268f6fd6a400f511b23be91f6b89d07b14a6a2d92f873efb4d9c146 SHA512 d65275b082c46c5efe7cf3264fa6794d6e99a36d4a54b50554fc56979d6c0837381587fd5399195e1db680d2a5ad1ef0b99a180eac2b4de5637906cb7a89e9ce
 DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221
@@ -51,5 +55,5 @@ DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f4
 EBUILD openssh-8.1_p1-r4.ebuild 16480 BLAKE2B a5e5d62c92081c5295cbbe035a83da2def0cdf22bd13da5621108d642f5537fd8c0c88849639267b0ee345c67926b6de44dd195e51bd56fdab15200eb5be7081 SHA512 a62ac99608dd98656ccf03834026af28f279eb635d7852fe2b0aea42f0d83ee0c776b63e48b14f09aa5c746ef7647ab2069edd151384ab8a2c260580ebc70873
 EBUILD openssh-8.2_p1-r7.ebuild 16906 BLAKE2B 8cd3c1a0712ebc989497e7f45b39551d07ee29928f5c64719c96cd4d1ea460259fdf437d828827954961596c4255041a65a0965db48e62b63bdf4d48c313e882 SHA512 ce10e972fa022f40ed1800eedf9f946322a993d1183a22ddd636f819da6a000594d1602a89bb4bbc7788dffce2d4a366013ac29a2ac09f1c09588ccd62965f90
 EBUILD openssh-8.3_p1-r5.ebuild 17637 BLAKE2B 53dcc07031b2379c21ad59ab66f118a048b3b2a3843ae024e473c334e4ba2975caf5756340a77a9ea7989bc040e6b3b1edddde9ecb7b3f6f1cea2e37a7406e35 SHA512 54ea55d5e87cf9beaeee2f9e8d289117200c841581ee7372eb6f0acb8c84c4d81bfc265eb7d15186494c19c3f700b87208d5a9ecbc6d41e57a0aa785239daae2
-EBUILD openssh-8.4_p1.ebuild 17654 BLAKE2B 3e5d4c01aa9a8c30ec97f5585a5161e383a9987859ea55567c8deaca194c60ff0492bdd72d28147248a894356c2d67df0fb07190a60d8bb23ba83943f4546549 SHA512 631da022c38e69469f68eebbdc06c3652248de9c55a4700708f38994e88c3be8d778aef7abde9f28f45da65cfffb210017ac3508810f5631ddf15564a7ee85a7
+EBUILD openssh-8.4_p1-r2.ebuild 17700 BLAKE2B faeeca3536a0640f46b7301e74737fce9e52aa9e7ac1c6715de2d0eda9f3d6cba356544da746d4bdd4c9f2c73758b20dd74bf9849f036218489deb75cd6b6105 SHA512 8bb9056d40334598037a9053c610cbd618f89adf2133012e8d0bb65f2497195c375815ea94deb1c1f9605e820003ffb25d968e64c23fa608370175de15d5c926
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch b/net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch
new file mode 100644
index 000000000000..f12a3096b64a
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.4_p1-X509-glue-12.6.patch
@@ -0,0 +1,34 @@
+diff -u a/openssh-8.4p1+x509-12.6.diff b/openssh-8.4p1+x509-12.6.diff
+--- a/openssh-8.4p1+x509-12.6.diff	2020-10-04 10:58:16.980495330 -0700
++++ b/openssh-8.4p1+x509-12.6.diff	2020-10-04 11:02:31.951966223 -0700
+@@ -39348,12 +39348,11 @@
+  
+  install-files:
+  	$(MKDIR_P) $(DESTDIR)$(bindir)
+-@@ -384,6 +365,8 @@
++@@ -384,6 +365,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)
+@@ -103950,16 +103949,6 @@
+ +int	 asnmprintf(char **, size_t, int *, const char *, ...)
+  	     __attribute__((format(printf, 4, 5)));
+  void	 msetlocale(void);
+-diff -ruN openssh-8.4p1/version.h openssh-8.4p1+x509-12.6/version.h
+---- openssh-8.4p1/version.h	2020-09-27 10:25:01.000000000 +0300
+-+++ openssh-8.4p1+x509-12.6/version.h	2020-10-03 10:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.4"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.4p1/version.m4 openssh-8.4p1+x509-12.6/version.m4
+ --- openssh-8.4p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.4p1+x509-12.6/version.m4	2020-10-03 10:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch b/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch
new file mode 100644
index 000000000000..32713d43ff32
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch
@@ -0,0 +1,30 @@
+From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001
+From: Oleg <Fallmay@users.noreply.github.com>
+Date: Thu, 1 Oct 2020 12:09:08 +0300
+Subject: [PATCH] Fix `EOF: command not found` error in ssh-copy-id
+
+---
+ contrib/ssh-copy-id | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
+index 392f64f94..a76907717 100644
+--- a/contrib/ssh-copy-id
++++ b/contrib/ssh-copy-id
+@@ -247,7 +247,7 @@ installkeys_sh() {
+   #    the -z `tail ...` checks for a trailing newline. The echo adds one if was missing
+   #    the cat adds the keys we're getting via STDIN
+   #    and if available restorecon is used to restore the SELinux context
+-  INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF)
++  INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
+ 	cd;
+ 	umask 077;
+ 	mkdir -p $(dirname "${AUTH_KEY_FILE}") &&
+@@ -258,6 +258,7 @@ installkeys_sh() {
+ 	  restorecon -F .ssh ${AUTH_KEY_FILE};
+ 	fi
+ EOF
++  )
+ 
+   # to defend against quirky remote shells: use 'exec sh -c' to get POSIX;
+   printf "exec sh -c '%s'" "${INSTALLKEYS_SH}"
diff --git a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch
new file mode 100644
index 000000000000..9bd600b6a1cc
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-X509-glue.patch
@@ -0,0 +1,129 @@
+diff -u a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff
+--- a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff	2020-10-04 11:04:44.495171346 -0700
++++ b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff	2020-10-04 11:48:05.099637206 -0700
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -46,7 +46,7 @@ CFLAGS=@CFLAGS@
+- CFLAGS_NOPIE=@CFLAGS_NOPIE@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+- PICFLAG=@PICFLAG@
++ LD=@LD@
++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -803,7 +803,7 @@
+  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
+  {
+  	struct session_state *state;
+--	const struct sshcipher *none = cipher_by_name("none");
++-	const struct sshcipher *none = cipher_none();
+ +	struct sshcipher *none = cipher_by_name("none");
+  	int r;
+  
+@@ -901,17 +901,18 @@
+  }
+  
+  /*
+-@@ -2203,6 +2210,10 @@ fill_default_options(Options * options)
++@@ -2203,5 +2210,10 @@ fill_default_options(Options * options)
+  	if (options->sk_provider == NULL)
+  		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
+- #endif
++ 
+ +	if (options->update_hostkeys == -1)
+ +		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+- 
+- 	/* Expand KEX name lists */
+- 	all_cipher = cipher_alg_list(',', 0);
+++
++ 	/* expand KEX and etc. name lists */
++ {	char *all;
++ #define ASSEMBLE(what, defaults, all) \
+ diff --git a/readconf.h b/readconf.h
+ index e143a108..1383a3cd 100644
+ --- a/readconf.h
+@@ -950,9 +951,9 @@
+  	/* Portable-specific options */
+  	sUsePAM,
+ +	sDisableMTAES,
+- 	/* Standard Options */
+- 	sPort, sHostKeyFile, sLoginGraceTime,
+- 	sPermitRootLogin, sLogFacility, sLogLevel,
++ 	/* X.509 Standard Options */
++ 	sHostbasedAlgorithms,
++ 	sPubkeyAlgorithms,
+ @@ -679,6 +683,7 @@ static struct {
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
+diff -u a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff
+--- a/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff	2020-10-04 11:04:37.441213650 -0700
++++ b/openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff	2020-10-04 11:50:55.865616716 -0700
+@@ -382,7 +382,7 @@
+ @@ -888,6 +888,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -1193,14 +1193,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index a2eca3ec..ff654fc3 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_8.3"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v22"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+diff -u a/openssh-8_3_P1-hpn-PeakTput-14.22.diff b/openssh-8_3_P1-hpn-PeakTput-14.22.diff
+--- a/openssh-8_3_P1-hpn-PeakTput-14.22.diff	2020-10-04 11:51:46.409313155 -0700
++++ b/openssh-8_3_P1-hpn-PeakTput-14.22.diff	2020-10-04 11:56:57.407445258 -0700
+@@ -12,9 +12,9 @@
+  static long stalled;		/* how long we have been stalled */
+  static int bytes_per_second;	/* current speed in bytes per second */
+ @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
++ 	off_t bytes_left;
+  	int cur_speed;
+- 	int hours, minutes, seconds;
+- 	int file_len;
++ 	int len;
+ +	off_t delta_pos;
+  
+  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+@@ -30,15 +30,17 @@
+  	if (bytes_left > 0)
+  		elapsed = now - last_update;
+  	else {
+-@@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
++@@ -166,8 +173,8 @@ refresh_progress_meter(int force_update)
++ 	buf[1] = '\0';
+  
+  	/* filename */
+- 	buf[0] = '\0';
+--	file_len = win_size - 36;
+-+	file_len = win_size - 45;
+- 	if (file_len > 0) {
+- 		buf[0] = '\r';
+- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
++-	if (win_size > 36) {
++-		int file_len = win_size - 36;
+++	if (win_size > 45) {
+++		int file_len = win_size - 45;
++ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
++ 		    file_len, file);
++ 	}
+ @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
+  	    (off_t)bytes_per_second);
+  	strlcat(buf, "/s ", win_size);
diff --git a/net-misc/openssh/openssh-8.4_p1.ebuild b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
index 6248805da228..4122763052b2 100644
--- a/net-misc/openssh/openssh-8.4_p1.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
@@ -21,7 +21,7 @@ HPN_PATCHES=(
 )
 
 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-#X509_VER="12.5.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="12.6" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -138,6 +138,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
 	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
 
+	# https://bugs.gentoo.org/749026
+	use X509 || eapply "${FILESDIR}"/${PN}-8.4_p1-fix-ssh-copy-id.patch
+
 	# workaround for https://bugs.gentoo.org/734984
 	use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch
 
@@ -189,13 +192,7 @@ src_prepare() {
 		pushd "${hpn_patchdir}" &>/dev/null || die
 		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
 		eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-libressl.patch
-		if use X509; then
-		#	einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
-		#	# X509 and AES-CTR-MT don't get along, let's just drop it
-		#	rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die
-
-			eapply "${FILESDIR}"/${PN}-8.2_p1-hpn-${HPN_VER}-X509-glue.patch
-		fi
+		use X509 && eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-X509-glue.patch
 		use sctp && eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-sctp-glue.patch
 		popd &>/dev/null || die
 
@@ -323,8 +320,16 @@ src_configure() {
 		$(use_with !elibc_Cygwin hardening) #659210
 	)
 
-	# stackprotect is broken on musl x86 and ppc
-	use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect )
+	if use elibc_musl; then
+		# stackprotect is broken on musl x86 and ppc
+		if use x86 || use ppc; then
+			myconf+=( --without-stackprotect )
+		fi
+
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
 
 	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
 	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
@@ -436,7 +441,7 @@ src_install() {
 			|| die "failed to remove scp"
 	fi
 
-	keepdir /var/empty
+	rmdir "${ED}"/var/empty || die
 
 	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
 	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 9b5ebd7b7ab4..50401ef4f8f9 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,8 +1,4 @@
 AUX owncloud-client-2.6.3.14058-qt515.patch 470 BLAKE2B 70a1edb2a2ddd277ac9faf759715a5f7c956e4557d96ad30be8f02beb598ec8f87d6b42f8f5c90f4dbc60d86c022af0a63ed7d3fca44b7cef90955423b42e7ec SHA512 78eb25459347a56dd2bc8e4f7a359402cbd0359c9b5137f39939b0dd396f276d6c13663f3ac380055a0137558f5899527b23391242c1a89dadc6f92fd2f5b7f8
-DIST owncloudclient-2.6.0.13018.tar.xz 17311396 BLAKE2B b0c76b2fea51ca9e71f918ada2b99ce20b9b62494c41608e804c4ca0c8aafe59897fea31d28bed1ec61feefca4b4b6e783c6fa777ea56524e7c18d1a460ab954 SHA512 b8eb9dc6f9c061a74fee3f31926a3fb7f5093277955fe327d1169c84f929d1e1ad8da472a7098c1c10399f395c6bfc3b2684cf4c85cddc5e45b733abfb8e4046
-DIST owncloudclient-2.6.1.13407.tar.xz 17317284 BLAKE2B b88bfc987aca036b6269e094cee5b91a3516db7b899df4cfde4961ba6eb3bb24329de103b154f0a21e5778997659cfb9b53be2f88affe03251aa9c747276d517 SHA512 40e0b607ac6cd5437682cd40e125404472c5ad63520e1dde19729760c0b7612451b3a34ede74e988d8fd09a6fae7d17a3dd6c5b0cfa6563dab7245e5f67c52bf
 DIST owncloudclient-2.6.3.14058.tar.xz 21246672 BLAKE2B 15b75c2162d22c22827a057242d783e739837f618c2f65be3edce6b2678aaa13505fd14c4e4088374c240537a999d9aff7758ccb93993e0cbdebb886f735311c SHA512 e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3
-EBUILD owncloud-client-2.6.0.13018.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
-EBUILD owncloud-client-2.6.1.13407-r1.ebuild 1828 BLAKE2B b58064a7d7aea0fd070d1807e088bcce962acd628b9b9af8cea4eeb8f011824d82a639c8b25650210e23695c3cd2942c519f95e68ae0603e6a29a64024442afb SHA512 c3e07a9973d05adb0413185a2b68bc34fa1844df0a458850d05bee15540e1cab7bbd825703ca31676e94efc81dc947f1c3ee1b75df2daee6ee65ed007ba6dbbb
 EBUILD owncloud-client-2.6.3.14058.ebuild 1872 BLAKE2B 554174a400aaeb6437ae60011b1ed0cb52a1a8c82bfd0d5dc2b797147d38e029e89d993b68514e3fe3d77cba535bb92625f67729be04a950f5ed9a5d5822a1d1 SHA512 975b7ccf846042d4b32f67760cc409b43ca86d053adbac42d780373374c3eaa4488c3adb1ccd86741dc7fcb0794e2332214c0abbecddf0f142850a1dcdc3fd05
-MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
+MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49
diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml
index c4baadc214ca..abf32936e094 100644
--- a/net-misc/owncloud-client/metadata.xml
+++ b/net-misc/owncloud-client/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
-		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild b/net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild
deleted file mode 100644
index 406a7f288f9f..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	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/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 )"
-
-S=${WORKDIR}/${P/-}
-
-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() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.6.1.13407-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.6.1.13407-r1.ebuild
deleted file mode 100644
index a084b55ed744..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.6.1.13407-r1.ebuild
+++ /dev/null
@@ -1,83 +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="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="https://owncloud.org/"
-SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin gnome-keyring nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[gnome-keyring?,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/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )"
-
-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 )"
-
-S=${WORKDIR}/${P/-}
-
-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)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	xdg_pkg_postinst
-}
diff --git a/net-misc/portspoof/Manifest b/net-misc/portspoof/Manifest
index cb43adec2ba9..a38203c32b8b 100644
--- a/net-misc/portspoof/Manifest
+++ b/net-misc/portspoof/Manifest
@@ -1,4 +1,4 @@
 DIST portspoof-1.3.tar.gz 401187 BLAKE2B 340e7003e3ad36afeb53981d0628d13ec48afd9260fdd9f17b76b904b3da58d82dc23b455da24567545d60b29f2f358b11f4a07e83ae2192470fa40099f93c1c SHA512 8d537ecf2ae5de8388c2b9b7210a2d38fe614e525a2ba286321fcf3b237f0888e59bb79a80056e49cf7f850be8ef274e87f04597a50dc1b86350bbc094e8be6e
-EBUILD portspoof-1.3.ebuild 913 BLAKE2B 595f2ad48fc12cc18f08cbc63f07af62ec35e8f18885e2337792657ba94941d981395a4d7ca7ff319ae230a368acd1661c7a50b9e4904872dbca1230ed11d76b SHA512 0dd22701c48035f16eec96e50147cc35a8b3b24fcec0136711c6309eddb8a711cce7a774e3f40b2c1162469ad76eda3053a615f620217707ee75833ab99ea34b
-EBUILD portspoof-9999.ebuild 913 BLAKE2B 595f2ad48fc12cc18f08cbc63f07af62ec35e8f18885e2337792657ba94941d981395a4d7ca7ff319ae230a368acd1661c7a50b9e4904872dbca1230ed11d76b SHA512 0dd22701c48035f16eec96e50147cc35a8b3b24fcec0136711c6309eddb8a711cce7a774e3f40b2c1162469ad76eda3053a615f620217707ee75833ab99ea34b
+EBUILD portspoof-1.3.ebuild 1013 BLAKE2B 848b7eb113a109f2de7169156193ce8cf2666479178b71eea036e3ecfd9357c88758fab5e9916850faaf71679167f78fd3324263c528c6bc868f23b528fcde6c SHA512 e32f2d1f7488601a130b110f173155ee0bcee97875e39eb5a5500fed96e95108b179afed365b88e38061fd93eebde9f9a511ea053c61ef870935a13388420ef7
+EBUILD portspoof-9999.ebuild 1013 BLAKE2B 848b7eb113a109f2de7169156193ce8cf2666479178b71eea036e3ecfd9357c88758fab5e9916850faaf71679167f78fd3324263c528c6bc868f23b528fcde6c SHA512 e32f2d1f7488601a130b110f173155ee0bcee97875e39eb5a5500fed96e95108b179afed365b88e38061fd93eebde9f9a511ea053c61ef870935a13388420ef7
 MISC metadata.xml 328 BLAKE2B 3aa60baed442cec358463ee0f0755d4c6582b8059ae8c02417145ca8a723a5a6bf7ddc3de999b519128a4cea0fb2257faca126809115e3079f284c4094bc70a3 SHA512 328a86e4be2cc8a6de438e3684832d6dcfde5562581d65ddb88b68a56aa980be8b838f93ce9925accb239dd7d2fbb67249661b55db7631b6fd7906b0b63aedd3
diff --git a/net-misc/portspoof/portspoof-1.3.ebuild b/net-misc/portspoof/portspoof-1.3.ebuild
index 7dc45df92641..48332848d894 100644
--- a/net-misc/portspoof/portspoof-1.3.ebuild
+++ b/net-misc/portspoof/portspoof-1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="return SYN+ACK for every port connection attempt"
 HOMEPAGE="http://portspoof.org/"
@@ -15,7 +15,6 @@ RDEPEND="${DEPEND}"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/drk1wi/portspoof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -23,11 +22,14 @@ fi
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
+	    mv configure.in configure.ac || die
 		eautoreconf
 	fi
 	sed -i \
 	's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\
 	 system_files/init.d/portspoof.sh
+	sed -i '/#include <sys\/sysctl.h>/d' src/connection.h || die
+	eapply_user
 }
 
 src_install() {
diff --git a/net-misc/portspoof/portspoof-9999.ebuild b/net-misc/portspoof/portspoof-9999.ebuild
index 7dc45df92641..48332848d894 100644
--- a/net-misc/portspoof/portspoof-9999.ebuild
+++ b/net-misc/portspoof/portspoof-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="return SYN+ACK for every port connection attempt"
 HOMEPAGE="http://portspoof.org/"
@@ -15,7 +15,6 @@ RDEPEND="${DEPEND}"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://github.com/drk1wi/${PN}.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/drk1wi/portspoof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -23,11 +22,14 @@ fi
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
+	    mv configure.in configure.ac || die
 		eautoreconf
 	fi
 	sed -i \
 	's#/usr/local/bin/portspoof -D -c /usr/local/etc/portspoof.conf -s /usr/local/etc/portspoof_signatures#/usr/bin/portspoof -D -c /etc/portspoof.conf -s /etc/portspoof_signatures#'\
 	 system_files/init.d/portspoof.sh
+	sed -i '/#include <sys\/sysctl.h>/d' src/connection.h || die
+	eapply_user
 }
 
 src_install() {
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index a4e54156a70a..d90912640702 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -1,5 +1,5 @@
 AUX pps-tools-1.0.1-install.patch 693 BLAKE2B 6f85d636697c30abee4a5c3c83d8c0a636c1e70343a373ab483bb98a7d5d4db60373ad0337f2feadf0f64585bf180211df8cfc17f1e465023884477bdac3a8f4 SHA512 84b5f43103b38ac611d8ab18d08bfa8ee938e4667cf6cd3d3a0dd1ff405a694c118780c576e19ee368a4389797f349eb0c341e95cec0d2e0c3d1a30510407cbc
 AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a573d4e69bec67283aac1c19ab86939478b2ce6a205671d9282cfd17f7f0731653374d1fb7971bbead75c6ac6a23e4 SHA512 3494d05eca69fb3b3011ce79a4b8cbaab5eb2ec89abb2b1ffabbd1d677585b4054bae398c4703048be0e32c4cdbd9c188fb624571b688630d95b03396e5e759c
 DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
-EBUILD pps-tools-1.0.2.ebuild 544 BLAKE2B 98ca845a43a744c287750f2e81d4040eafc52a769c4c4983d69b7db866a034155a72da3719052a5c2b7404b6c5a2b7c429f1b0f21eceb7205bd3d6029b023fb3 SHA512 3a37793a5493210a619e575dda0765eea43c1e932361249cf0d3f9c32364b6f6938a310ffa410a5c26d0d0af0bdd0490445fa8d5c98cb5adfde064e117e1b6da
+EBUILD pps-tools-1.0.2.ebuild 543 BLAKE2B 6c6f1dc15502db9cef95339af8a8bb42a3bedcfac2074bb69ddd7c83731eaf5d15b21f258e0b62f1de65c8e33e17fddf549f9227a9ade52ef8b62ae6055c4c4b SHA512 9a39032af2f1c90d14018efab566e6974be46c989f388b717cb15fad17ff592b067ed2f080fb91a1c5d01f1a5a489863eea16ad5cca95324ca1cf261a30d75d9
 MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06
diff --git a/net-misc/pps-tools/pps-tools-1.0.2.ebuild b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
index c9c3561e2f2f..4a6d6b7e3f23 100644
--- a/net-misc/pps-tools/pps-tools-1.0.2.ebuild
+++ b/net-misc/pps-tools/pps-tools-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redlab-i/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index cf86f6aec58c..fdb02f51e05d 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,3 @@
-DIST pssh-2.3.1.tar.gz 23427 BLAKE2B 7297ec83d31272506a34ca771a4476deb0e22f6d85f770cd380d6122e2e39c40f6767b84286efd9980c53729f5f7e0ed19af566cc1eea358ffd9fb0820eca167 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f
-EBUILD pssh-2.3.1-r2.ebuild 726 BLAKE2B 9a7ae47d5674f7f29f2a4a362e0b69f443d9239338022b78a4f91c06157df61304cf755bf61092f6d7b69abf2af8324dde966ac3360cf0898a0ccd17a5c537b2 SHA512 7335dcb8885b4dc12e147ca114d1ee45ac2049f4083a11fdfee54f6df59651bab761131ec82b119e984ae158898c57e5231963c206f34895753198ef291a6731
-MISC metadata.xml 339 BLAKE2B fd5344fdf419b900b25c757d4f4bee0084c9493f73f77dd4d760ca8c438bb71e00fecf2aab2acbb62c2d824e149e4db8a1b6fa32814b945ed56969612f36e21f SHA512 bcea2011bb23b0796bbfa66c6cadedbd03d06ab15f9254c444d6cfe6c1985a41ad37dbafc214cbcdba73f3cb789ac3ec4a42fdb5a20cf9d38a88ef0d23c588ff
+DIST pssh-2.3.4.tar.gz 51859 BLAKE2B 788f5239cd35e240cc1961e73b532c60e5221ede9de48878f9636339b18235dc67109948eeb4f64871985bb24e1a7f823b1718da3dbe2ea893af58fd45495c61 SHA512 7abf327ca53dda2402465254e447eb837babdd2b4d865abb5b52a1135bd234694b84c1148cb3e4ed0198271ed29333fc1b5d0d01dc653fcf6d3e5b9f170b9d4e
+EBUILD pssh-2.3.4-r1.ebuild 749 BLAKE2B 9e68b153d83d5b232c2517dd264d8ae25867feaa915910d0912f4c3d8637ffe8a07453cb4e1104e8a1beb3cebfd6508c33ca2c1b2b44da51cf4e643c52eafe46 SHA512 1b79cdd6e89c471baec360432bf5918ed9801091fb9f53a42a9d0a567cc7372b900392e86e8696b82740b1aef358f683af7af696528daa793e683d67a34a5e8e
+MISC metadata.xml 414 BLAKE2B b618a786508c9777aa9f8988aadc67d1f453384dad74d8cd7403d8c923817d1b8641f2c5896b90ccb3059b1747b3cd6aa6307890632d6c66f95c8040c21aeb05 SHA512 e5360c5b9bd03e13cb761a575faf22e4cc0efc0bd005c9ef0c05a0b3cd12df6d1acfa807e85b04e7bde7e05d77ee96fd993784a56026bf253d78b1ba9bb06ff4
diff --git a/net-misc/pssh/metadata.xml b/net-misc/pssh/metadata.xml
index b6d9446e89b5..195b1ffe89db 100644
--- a/net-misc/pssh/metadata.xml
+++ b/net-misc/pssh/metadata.xml
@@ -5,7 +5,10 @@
 		<email>cluster@gentoo.org</email>
 		<name>Gentoo Cluster Project</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
 	<upstream>
-		<remote-id type="google-code">parallel-ssh</remote-id>
+		<remote-id type="github">lilydjwg/pssh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/pssh/pssh-2.3.1-r2.ebuild b/net-misc/pssh/pssh-2.3.4-r1.ebuild
index eb333cc8d3a5..08289ea07a0e 100644
--- a/net-misc/pssh/pssh-2.3.1-r2.ebuild
+++ b/net-misc/pssh/pssh-2.3.4-r1.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
 
 DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
-HOMEPAGE="https://code.google.com/p/parallel-ssh/"
-SRC_URI="https://parallel-ssh.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/lilydjwg/pssh"
+SRC_URI="https://github.com/lilydjwg/pssh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="net-misc/openssh
-	!net-misc/putty"
+		!net-misc/putty"
 DEPEND="${RDEPEND}"
 
 # Requires ssh access to run.
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 1a5f49e1ccec..3772b1900e3c 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -2,4 +2,4 @@ DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.74.ebuild 1683 BLAKE2B f2e694377eaa8ae5dad4c136ce82ea3a1f8707bef3b9a7527228a2b49c382e2ade8e2215ea1d93a0bafd74fff4360369578a8eb85af94157cb90bc3352b67bb0 SHA512 2fde3aaa7af3b725e5d61deb410f26e32dc7230b11ec524e8ed768543bb69691d623a7e10ba97f2df59cabf4c26bd823c7800ee9c705a5fd5312454d311c7243
 EBUILD putty-9999.ebuild 1737 BLAKE2B 7e09d4cbf3e219f2452f535ef15a1733c77b72fedf8336968b88cb4adbc6e7ab13fb4dd3bfea9150a23198d1e5d649a1a099d65da0263e8942f39ea02001e1ad SHA512 30577a60f28a9ef6fcb6e763a93d4ce624d4ba23708181eef42d8c20afc303f1c42af598808957caa80759a40d02c294eb19b16eea369ff801ef57b74d00fbe4
-MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
+MISC metadata.xml 1010 BLAKE2B a21ec4ee14bf1b61343ad8f504ee9ccfcf090ad6212c5ffe570b44e3443baeacb1fc3dc3080ce8611f730edf54e8a459d4669fc1bb7ca0c52b35567facab075d SHA512 1649e0d50d4f8318c2869a7e6ebb697f05c16f5e4e9bbe1b35ba38c1513c4bb14f2d4283fd3fd91fe30ab9bcf318f619d7c39ee1bcc3c476b95555e2939b2c8b
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 6f7ffaa0c972..5e99e6c774c8 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<longdescription lang="en">
-PuTTY is a free implementation of Telnet and SSH for Windows and Unix
-platforms, along with an xterm terminal emulator. It supports flexible terminal
-setup, mid-session reconfiguration using Ctrl-rightclick, multiple X11
-authentication protocols, and various other interesting things not provided by
-ssh in an xterm.
-</longdescription>
-<use>
-<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
-<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built</flag>
-<flag name="gtk2">Build the PuTTY client with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag>
-</use>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
+		PuTTY is a free implementation of Telnet and SSH for Windows and Unix
+		platforms, along with an xterm terminal emulator. It supports flexible terminal
+		setup, mid-session reconfiguration using Ctrl-rightclick, multiple X11
+		authentication protocols, and various other interesting things not provided by
+		ssh in an xterm.
+	</longdescription>
+	<use>
+		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
+		<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+</pkg>. If disabled only the CLI tools puttygen, plink, pscp and psftp will be built</flag>
+		<flag name="gtk2">Build the PuTTY client with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index adc246173725..249024a94783 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,4 +1,4 @@
 AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0
 DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565
-EBUILD qtm-1.3.19.ebuild 1110 BLAKE2B 4229f674c8ce4cd3fd9a6b1f95352ccec99df534453a788ebfb83ad322e63c60f056c24f172beaab5a6fe96ca9a05382000b101af2f67604b952cfbcfa881d3c SHA512 67bf5642cc29061088593baa092e536ad179d7afcef3b33987b6af7e1c6d024fd2a9eb3e7cc58c1b120f5b7376d61416cdc23928112b588134c83ee2f375dd25
-MISC metadata.xml 382 BLAKE2B f06322dd6521d5ca81b3b9f409189f4c0a4e1e1e31dc04a8b5ec03c0b265fe947a377437e75cc906de5f9b8fb1783abd176fa812c5d193663febefe88699f22e SHA512 009632d82fedc2deb9796dba8a2de9910afd0b67617f5c1d9ecd14fc641f61839812815197089dc186a201a8848de3706d56802f12f33f22a3badad2cd99420f
+EBUILD qtm-1.3.19.ebuild 1171 BLAKE2B 48d68f1e6fda9825833f4bf7b796ad12a26b64c063a8bcea4edb6fd4ed39ac8d9ec1d745e8364ee10ee0b465e97708bfd39988d65b68f02e08cf2d478380c4d4 SHA512 c011832aac96c820445ffa24149e26641b8f61bb48e583427ac7ca1d26a97c1c28d4ec56146d7195962a8abbc29a606832a040b7661cbc87fd0b0824b8c2315a
+MISC metadata.xml 323 BLAKE2B 9a2acba00a78ae523e8e0911a81237371b07ad64a6c9c508cb3bf8a7e092143cd512ea33a5ca5825edc81ee7d312a47385bb566bbbb876f8ca3c54592ee392a0 SHA512 f84bcb5a622eaf479bae92f367748cfb749b633fe3c5089db7a2dc6193a5ca103195ad12bc894fe2b05c5bb1de4eb3baee5bbcda8c018ca6968add97719748e2
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index 714795566c77..add5ebf14475 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">catkin</remote-id>
-		<remote-id type="bitbucket">IndigoJo/qtm-1.3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19.ebuild
index ab8d12142a5f..24f10c68555e 100644
--- a/net-misc/qtm/qtm-1.3.19.ebuild
+++ b/net-misc/qtm/qtm-1.3.19.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # CMAKE_IN_SOURCE_BUILD="1"
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="Qt blogging client"
 HOMEPAGE="http://qtm.blogistan.co.uk"
-SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(ver_cut 1-2)/downloads/${P}.tar.bz2"
+# FIXME find suitable SRC_URI
+SRC_URI="https://bitbucket-archive.softwareheritage.org/static/3c/3c8ca320-701e-47dc-b0ec-28870df5715b/attachments/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 2effa7a63eab..ae53486930c2 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,8 +1,6 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
-DIST rabbitmq-server-3.8.4.tar.xz 3086216 BLAKE2B c1c22ebca1b66aa210b45b3fccfffd89f3bb9312d37c78362db6d728456c8b7f3a0d787bcd411909509130307faf8457e4a7becb40cbf76ebb1cd1f1b615cce6 SHA512 2dee202b0a39f3d3d4314c4a5ee812d1c2b85225c6cdfc9ddb887285176df8d7009ca4ac8c3ab61cc3a943d32fa7665124dbf51ed18a322a280a3590601f118d
 DIST rabbitmq-server-3.8.7.tar.xz 3074228 BLAKE2B 131e79cc97c64fb5ba8d0c4906501da34e8569cb498ec61fe16be05923e2e2787a3d4ae5291f27efa619a0988b3c98ab8109ec2c0bc2c74da48c4ddc2f5e2cd7 SHA512 0d9771576f5b0b3ee68386ad02c7b01aa9939c38ab1aa8a8e2fe5f5b494b5cd855d2a5029a74364c6bf5097e8a70ef95e325ef9a9945576344c1a33ace0998ac
-EBUILD rabbitmq-server-3.8.4.ebuild 2374 BLAKE2B 3befa2b1082a817401324e00a571f3e59bb66cd97e1249adb791edfe3b78e005d3169af7068e3cad23595196873b6bbc127c8b668091bb859c06aaffd0cfe8c5 SHA512 4386018e0dd428346285d082681b43b0e3fd2c25be676301ef176e18e7c475e2e9cfb85eede2a7d4e18b2964f1b7e9db696986eb52a71f8e5b63c141a98ec92a
-EBUILD rabbitmq-server-3.8.7.ebuild 2155 BLAKE2B 1c5b704dce029f7919f973848aa2e15509166921b8f305cb2c0593c719d54ba69211858e8bee407e6102bf9e8843c7604fbc8943bdaeaf2306941f0d1629d6bb SHA512 b48d6788c4b718f1301aab62b5a5b37e1fe79bd6dd35a25eb4c2e87aedededeb809db45fa807f8fab34dc5e9d168b5af547aea9231dc67413fda1eff7e187fdc
+EBUILD rabbitmq-server-3.8.7.ebuild 2153 BLAKE2B 80232bb0dd47451e989863a342287e949db51ab0c7172ab58ce5b9f8576b1c5b05fddbd68c40d00eb4d171fa4ac80d35f3c68a1bd94672d65e5a271041aff402 SHA512 fe4ac55311bb94881d53f16ba122afea441aff216e04a1ffb5aebef93d62e270d2e0cde9e1d62974d0739b54e7fc8aa66950c8599566b7ea52a831cee9c1ae14
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
deleted file mode 100644
index 99334121ba05..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
+++ /dev/null
@@ -1,84 +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 python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-RESTRICT="test"
-
-# This is the first release to officially support Erlang 23.
-# There is one remaining known Erlang 23 incompatibility:
-# rabbitmq-diagnostics observer will fail on Erlang 23.
-# This will be addressed in a future release.
-RDEPEND=">=dev-lang/erlang-21.3[ssl]
-	<dev-lang/erlang-23.0[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.8.0
-	<dev-lang/elixir-1.11.0
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/include deps/rabbit/priv escript plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
index 87c9d4ebe3e7..b52690d167bc 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra
 
 LICENSE="GPL-2 MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 RESTRICT="test"
 
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index f504115477ac..e456983afcd0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,6 @@
 AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59
-DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
-DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9
 DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
-EBUILD remmina-1.4.5.ebuild 2526 BLAKE2B ba26b2f4e3bcd9f272b0c5acd7d97f387809dc0db5a3c07b24ecf9b4f556ab9c8d4a6d7f51221e5d15f17fc436197a766c7b5a28c0fa98fb1e12b234baab07c9 SHA512 d3f39ff7c4d8d32fb175e03f796c3ccb482a32e726216201a2c114cb16ef373eec731aa9fdea3ff273c2928c377275d73494f666ae9cbfa19edc0b724300c7a0
-EBUILD remmina-1.4.7.ebuild 2529 BLAKE2B b703d493b3234c0f131e5407f5affca72795f4450a27cbcef99a684d2a80403b296c6bee0b42c199d25c59fd9d5e57bf658ea073f5fb7408105e04eabb8c1996 SHA512 a806170ef86f63ceb1c5bdb51817c0415a003c759ce0487c69dee69e581035e7f8cea05e2b2f894121600e882bb16d06b2e1aeade956a6b712f0da6e663a23e7
-EBUILD remmina-1.4.8.ebuild 2529 BLAKE2B b703d493b3234c0f131e5407f5affca72795f4450a27cbcef99a684d2a80403b296c6bee0b42c199d25c59fd9d5e57bf658ea073f5fb7408105e04eabb8c1996 SHA512 a806170ef86f63ceb1c5bdb51817c0415a003c759ce0487c69dee69e581035e7f8cea05e2b2f894121600e882bb16d06b2e1aeade956a6b712f0da6e663a23e7
+DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177 SHA512 21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f
+EBUILD remmina-1.4.8-r1.ebuild 2493 BLAKE2B 444297b0607ae73a1a8868ddb5c5af4c58484adc944ad29d2c983b70c5ca482e20a7782d4681b59330183c074acc4d138517eb6e5bf702d5e2daa361ca96d2fa SHA512 95a1c2cf34f5039268cc58afbc36e6bc872f740a1ec2465ef95aa4c703b1592fd89ff86d7b1ef817ac184ac0b6202585f96bfab5e7a53c35b3018cc6f8a72b82
+EBUILD remmina-1.4.9.ebuild 2495 BLAKE2B eb98f41f1abc9e1ad47cd576a60b68b97f43dfbb57a3cf5d10354cf4cbfbf0e720b7d9eeca14bf22182461f63b2fbae185c85a96ebfd35f86ae51ff721729668 SHA512 0b860aaaf18815fcfd10293f14810c9948fea66636b1360bafce7a5335a239527b84a70aa70339fe54b46391a0fdf06a1e61b2284b141b667e5b733ab84f325f
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
deleted file mode 100644
index 496031854c5b..000000000000
--- a/net-misc/remmina/remmina-1.4.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libsodium:=
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
-		<net-misc/freerdp-3
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-with-examples.patch
-	cmake_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.7.ebuild b/net-misc/remmina/remmina-1.4.8-r1.ebuild
index 8c06917c5d43..4222860b8986 100644
--- a/net-misc/remmina/remmina-1.4.7.ebuild
+++ b/net-misc/remmina/remmina-1.4.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
 DEPEND="
@@ -27,8 +27,8 @@ DEPEND="
 	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
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
 		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	kwallet? ( kde-frameworks/kwallet )
@@ -40,7 +40,7 @@ DEPEND="
 	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] ) )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 BDEPEND="
 	dev-util/intltool
diff --git a/net-misc/remmina/remmina-1.4.8.ebuild b/net-misc/remmina/remmina-1.4.9.ebuild
index 8c06917c5d43..518563f4af8c 100644
--- a/net-misc/remmina/remmina-1.4.8.ebuild
+++ b/net-misc/remmina/remmina-1.4.9.ebuild
@@ -27,8 +27,8 @@ DEPEND="
 	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
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
 		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	kwallet? ( kde-frameworks/kwallet )
@@ -40,7 +40,7 @@ DEPEND="
 	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] ) )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 BDEPEND="
 	dev-util/intltool
diff --git a/net-misc/ris-linux/Manifest b/net-misc/ris-linux/Manifest
deleted file mode 100644
index f3fa47e53c62..000000000000
--- a/net-misc/ris-linux/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX binlsrv.confd 90 BLAKE2B c4cf8149e8fa970f76682701e1aa8248292cfc95f0094537381b85754ca166151b5a9985a17b7185572cf6a966fb07951bfcabc4df41fc59238b8ad2baacf97c SHA512 82ba3c67e5a4df2092bc4abc7ad27d70f3a315551ac871d3019f0c37e7aa6360893dfcf615def300963d1a48e66f19da79aec2444fc366fb1ee6e19ecdd3c8d0
-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 790 BLAKE2B d15a9513ce381f0f70311db403bf50fead7d0cdb4984c9b791397b3a3c33032923757436641d385cb19cd2d22b99a2e7b3dab6d7f1cb8ee27b51a79e7830228a SHA512 000f2f82c62a4a7bdd7909abc5b5a9d1209973a6a5be6ed5449d597bcb6544ebf2154e9c4c089a6b3d9eee978f215cf8110963a6e6c94c2e921571674b706f85
-MISC metadata.xml 217 BLAKE2B 19c9d1fa32b1387c2578d4acf482cfddbc144decd961796c2dabfe02ad2b11e232eee8fc02c900f176f7cbba0ecc741c66b1a55d3734b2901c40a98194a78433 SHA512 892fa1b0f9fef66cd02147277c70b886bfef9d36817e024d35216a14bd1a2bd640ffb8d6f57bed87cd06b7c4cce17eb3c8fe4255cdc62972b551c73509c0dfe7
diff --git a/net-misc/ris-linux/files/binlsrv.confd b/net-misc/ris-linux/files/binlsrv.confd
deleted file mode 100644
index 2e6ed9f9090f..000000000000
--- a/net-misc/ris-linux/files/binlsrv.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-#Specify here path to directory with 'devlist.cache' file
-INFILE_PATH="/var/lib/ris/binl"
diff --git a/net-misc/ris-linux/files/binlsrv.initd b/net-misc/ris-linux/files/binlsrv.initd
deleted file mode 100644
index f247a39db4ed..000000000000
--- a/net-misc/ris-linux/files/binlsrv.initd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting binlsrv"
-	if [ -z "$INFILE_PATH" ]; then
-		eerror "Path to devlist.cache not set, please set \$INFILE_PATH in /etc/conf.d/binlsrv"
-		return 1
-	fi
-	if [ ! -e "$INFILE_PATH/devlist.cache" ]; then
-		eerror "devlist.cache not generated, please make it with infparser.py"
-	fi
-
-	start-stop-daemon --start -i --exec /usr/bin/binlsrv.py --background \
-		--make-pidfile --pidfile /var/run/binlsrv.pid --chdir "$INFILE_PATH" \
-		--stdout /var/log/binlsrv.log
-	
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping binlsrv"
-	start-stop-daemon --stop -i --exec /usr/bin/binlsrv.py --pidfile /var/run/binlsrv.pid
-	eend $?
-}
\ No newline at end of file
diff --git a/net-misc/ris-linux/files/setup.py b/net-misc/ris-linux/files/setup.py
deleted file mode 100644
index 0873f2512c99..000000000000
--- a/net-misc/ris-linux/files/setup.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-from distutils.core import setup
-
-setup(
-    name = 'ris-linux',
-    version = 'VERSION',
-    scripts = [ 'binlsrv.py', 'decode.py', 'infparser.py', 'fixloader.py', 'modldr.py' ]
-)
diff --git a/net-misc/ris-linux/metadata.xml b/net-misc/ris-linux/metadata.xml
deleted file mode 100644
index 8f93e4dab3d6..000000000000
--- a/net-misc/ris-linux/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild b/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
deleted file mode 100644
index 282889fbed0b..000000000000
--- a/net-misc/ris-linux/ris-linux-0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="BINL server to doing Windows(r) RIS"
-HOMEPAGE="https://oss.netfarm.it/guides/pxe.php"
-SRC_URI="https://oss.netfarm.it/guides/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	|| ( net-ftp/atftp net-ftp/tftp-hpa )
-	net-misc/dhcp
-	net-fs/samba
-	sys-boot/syslinux"
-
-python_prepare_all() {
-	sed "s:VERSION:${PV}:" "${FILESDIR}"/setup.py > "${S}"/setup.py
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}"/binlsrv.initd binlsrv
-	newconfd "${FILESDIR}"/binlsrv.confd binlsrv
-}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 29412b0c9695..2629e6b664a9 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -5,6 +5,6 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.3.ebuild 4489 BLAKE2B 79ad583ddad8ad04d81b6bbc81c2528d5b4d4d22ac496599e34ce3b2debd36d1f8436a25f52a15bf74069e5e63dfea1a8073d2f5586883729cf065dc0d3e9861 SHA512 accd8273fd7877972798f2f57989686ebad200e138bf7aae2cb2e1c11251333491a54da1ec5b365b77e97ae9c5a5b872fa66d643bc010c595efd7e152180c5b3
-EBUILD rsync-9999.ebuild 4498 BLAKE2B 7d88aaf267cb0b8701fcdb13693acdb88f19b7155d3e13f8e3c64ca334ef5fab569543f47973a0f5f0522d2a657267c17e7aa982937b95e998a187d6bb482ddc SHA512 4054e8fd9154880c001e66f059b9e980084e34f9e1c8aacc4fb366668180c2ed0ef011f79ede25d3fc902db170b80327b0df4dbf9ea223d2e098e6f7e7f22166
+EBUILD rsync-3.2.3-r1.ebuild 4158 BLAKE2B 8799f0a6a3dfe57698dac66df7d25144146f89104a58a6d2a5861f5cae1b96c517893f5b780f5345be69987918986ac555a869358a9f192ee34c2d6304ece056 SHA512 eceb635395432be8a69244b75cbe780ce04d9587c190d7a44fe7b3387bd37a397d3f19c3581ec31387625c97f937950422c7f9323ce7bbb58819c4f97e02feb4
+EBUILD rsync-9999.ebuild 4167 BLAKE2B 620f61d37aaeb85d756c2f169b0c96b50bf94495988a17f8ae6fa44356e6347754e0db4511147469258ee5bc8f7ad06aef8c8ccab742280dedd5e805aacd5011 SHA512 86f77788bc0e25448240ab3e7f3d85cafd3be94aaa11ea4e38503e2e9ed196a10c0e6dc9534fc8d09be8aec3cfdeab9246cfb8eb2863710fe468345215b4b355
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/rsync-3.2.3.ebuild b/net-misc/rsync/rsync-3.2.3-r1.ebuild
index a502102dad2c..def4e99c5ffe 100644
--- a/net-misc/rsync/rsync-3.2.3.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r1.ebuild
@@ -25,24 +25,22 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd"
 IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
 
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	lz4? ( app-arch/lz4[static-libs(+)] )
+RDEPEND="acl? ( virtual/acl )
+	lz4? ( app-arch/lz4 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
-	system-zlib? ( sys-libs/zlib[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	xxhash? ( dev-libs/xxhash[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4[static-libs(+)] )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( dev-libs/xxhash )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/popt-1.5
 	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+DEPEND="${RDEPEND}"
 
 if [[ "${PV}" == *9999 ]] ; then
 	BDEPEND="${PYTHON_DEPS}
@@ -66,7 +64,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use static && append-ldflags -static
 	local myeconfargs=(
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
 		--without-included-popt
@@ -90,7 +87,6 @@ src_configure() {
 	fi
 
 	econf "${myeconfargs[@]}"
-	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
 }
 
 src_install() {
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 3624db6822a5..8cc796e01d64 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -25,24 +25,22 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE_CPU_FLAGS_X86=" sse2"
-IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl stunnel system-zlib xattr xxhash zstd"
 IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
 
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	lz4? ( app-arch/lz4[static-libs(+)] )
+RDEPEND="acl? ( virtual/acl )
+	lz4? ( app-arch/lz4 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
-	system-zlib? ( sys-libs/zlib[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	xxhash? ( dev-libs/xxhash[static-libs(+)] )
-	zstd? ( >=app-arch/zstd-1.4[static-libs(+)] )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	system-zlib? ( sys-libs/zlib )
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	xxhash? ( dev-libs/xxhash )
+	zstd? ( >=app-arch/zstd-1.4 )
+	>=dev-libs/popt-1.5
 	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
+DEPEND="${RDEPEND}"
 
 if [[ "${PV}" == *9999 ]] ; then
 	BDEPEND="${PYTHON_DEPS}
@@ -66,7 +64,6 @@ src_prepare() {
 }
 
 src_configure() {
-	use static && append-ldflags -static
 	local myeconfargs=(
 		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
 		--without-included-popt
@@ -90,7 +87,6 @@ src_configure() {
 	fi
 
 	econf "${myeconfargs[@]}"
-	[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
 }
 
 src_install() {
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index c4b80d7df405..91c1d61081ba 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.38.3.tar.xz 4106460 BLAKE2B 38547cd28b0039440cf5e4a7381914c606479c1f26f91eb8af14276a6aa7d6267f0fba5b2af374ca3f0b933c683d569e26cbcec8cbdd15d620d57bd1ecf32c48 SHA512 787508f809e473dccc8461128c1b3b9d71b118008fa13660144f32ccb4b1ad02f41866ddf00343e102ed6f13552d34278917e14cf50c57ea3ffb6cf474f0ce58
 DIST rygel-0.38.4.tar.xz 4123464 BLAKE2B b807dd7fd20c0fd77da6af49cb32399d3e83cd45f1eed121d9b16f201aff260eb4a381ec47774c638a274e83a9b4a1c10d6d317374891ffdb792217e2693fdb5 SHA512 791dcc624f90cdc77bd00e9513c15998d42979e0b3255dcfda771e1d9d718fe4a0127ba0d18e69b6f4e9259c9e691e187b69c6c55c5c35ccefaf5daf65a1f447
-EBUILD rygel-0.38.3.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3
 EBUILD rygel-0.38.4.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.38.3.ebuild b/net-misc/rygel/rygel-0.38.3.ebuild
deleted file mode 100644
index 7471a81e1649..000000000000
--- a/net-misc/rygel/rygel-0.38.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +introspection +sqlite tracker test transcode"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	>=media-libs/gstreamer-1.12:1.0
-	>=media-libs/gst-plugins-base-1.12:1.0
-	>=media-libs/libmediaart-0.7:2.0
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-1.1.0:0=
-	>=net-libs/gupnp-1.1.0:0=
-	>=net-libs/gupnp-av-0.12.8
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	X? ( >=x11-libs/gtk+-3.22:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.36
-#   dev-libs/libxslt
-
-src_prepare() {
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-		-i tests/rygel-playbin-renderer-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# We set xsltproc because man pages are provided by upstream
-	# and we do not want to regenerate them automagically.
-	gnome2_src_configure \
-		XSLTPROC=$(type -P false) \
-		--enable-gst-launch-plugin \
-		--with-media-engine=gstreamer \
-		--enable-nls \
-		--with-systemduserunitdir=$(systemd_get_userunitdir) \
-		$(use_enable introspection) \
-		$(use_enable sqlite media-export-plugin) \
-		$(use_enable sqlite lms-plugin) \
-		$(use_enable test tests) \
-		$(use_enable tracker tracker-plugin) \
-		$(use_with X ui)
-}
diff --git a/net-misc/s6-networking/Manifest b/net-misc/s6-networking/Manifest
index fd7c100ca262..90ac1df4ad1b 100644
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@@ -2,8 +2,10 @@ DIST s6-networking-2.3.0.2.tar.gz 85977 BLAKE2B 883caa1d2376e1897b35fd6992a512bb
 DIST s6-networking-2.3.0.3.tar.gz 86765 BLAKE2B 1454250de9014597e7cf3dfb7364fc5283b26c5510c5b7a825255af0626bd3b12ce456290c7a1fb58f61fae1bb5757ea4cd803a6896b554511e19cd01fa3741e SHA512 f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762
 DIST s6-networking-2.3.0.4.tar.gz 87120 BLAKE2B 76d3c8507c489ffd0dd21fd2dfac5ea272e63ef5a7c489619a938bd164bc554bcd501705de78a9737250cb4bccb3f87485cb82cd2abaa601867c1ac451a417a2 SHA512 e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3
 DIST s6-networking-2.3.1.1.tar.gz 87461 BLAKE2B 43cbb0762c48c31f0ee2f73605436397c2f7ae34bc788844c9fac0f15bd5a5693a8499c808f913b3cd5db53b30c7ffa425ce764c1d701b950c8b18421ff3e8d3 SHA512 3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b
+DIST s6-networking-2.3.2.0.tar.gz 87949 BLAKE2B 675974fd5a2e2e764944eb314725834bbc1e4a17b87af9559cda4bca4a6cb3f0e766741519a4d5024f7a8608dfe80310801a59a2b04f8ccd42acede27efeffe2 SHA512 876005e3060493fb22efb59dcdc3392eb746454cf9c11c9c0ebdd6b24789db18e364039096a8a4168dcd4023b98e539d8489d490a0b7a24ddccc437f7076618d
 EBUILD s6-networking-2.3.0.2.ebuild 1892 BLAKE2B 80830d023c1bebc7457fe4d882924f3761879665c771fd465e22e0cf095a76127f0b01eb891316366452d8fbe4065ddaaec7f157549ca72e6f21e97cc9d4cafe SHA512 26539e1976690200ff1882ae1fe761f45c670ac2192234d1a920d644a397be8144ee000100a43086ed19add9a5d403bee021f85b2be3badff1e3e2e67b60f76c
 EBUILD s6-networking-2.3.0.3.ebuild 1627 BLAKE2B 3d7db35321240f1445f904066c3b5d686c7533df0ef5b67c2264374b12f149d67039602e2a9ff4d8ec841c6bc8e91b51e06e06235a3c99abee99f08def666865 SHA512 804818cb31c44e11aa9d9a43c5c1a2f9a62cadd93abc9994d6ff9d77ed1e08dbab56a1940f1d092ec38a160d98bc3147f6583cd093b5f0e16d03dc163b7ef9e9
 EBUILD s6-networking-2.3.0.4.ebuild 1472 BLAKE2B 295b4795452b0f531e4a499346380f61addf9af31597471872ced7930ddde99c94f07accc1456b467333e9acb383493a0c76152b38f28486ad5156113679853d SHA512 88fb58f470a98c77d898dc7fb3d5c1817c319f7c75136aac0428135694186ceef766d2e1fd9371535d6143566f2780a1532159fbdfcb1dbc2e847ad54c20d2e0
 EBUILD s6-networking-2.3.1.1.ebuild 1472 BLAKE2B c660eb7f0c4161a6dd9d7f6fa3744c1bf876858c797b1c7a146253e2d562a21f8ffb1d3543fad14cfcdd5d8706ba3b7e9569f7e81093ae087614f5ef34ff7dcf SHA512 ad13653e8c3441d681555986c2e51eec0b7a3ef7e50f2ee398121d656a047819ee87b65d4142b33894291a6940a3b1f469611c726ff8cb3c27b86ee6a385ff80
+EBUILD s6-networking-2.3.2.0.ebuild 1481 BLAKE2B d2a06215ae86827004dcf95beab6504a6395470f5b8c89005b06c9f618b35b29cef899b8b1c3e6133eca002229cba7a71b6dc2db646db1f802d34d8dd50581d1 SHA512 f38cdb34b1bcd5bf23d02d682a1bb212057a4e48f50de0e37862f485556fa64df4db4e20de7b68b95ad46d5b634d69c8d3ad3b3912d0cb0d35f7dc5ca7afdf7e
 MISC metadata.xml 640 BLAKE2B b658892b1a86aa08807ad2c488f6c0540c999d2e996bfe8d4c66fa8eb61fc9bc2c2411664c9d625f1926ca3a3ca951e3c9e58bb345a8b70c4101a87f39eec08f SHA512 755a43469ee11e14b3503200b96b981145b4039fb8eae703ff8bf5e606d21fd2948cddd7f2c42d2793ace18942d261a9796706f704a7ba44f569bae2b7dbda74
diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
new file mode 100644
index 000000000000..a33079fa4a71
--- /dev/null
+++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Suite of small networking utilities for Unix systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-networking/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
+	>=dev-libs/skalibs-2.9.3.0:=[static-libs?]
+	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
+	!static? (
+		>=net-dns/s6-dns-2.3.3.0:=
+		ssl? ( >=dev-libs/libressl-3.1.4:= )
+	)
+"
+DEPEND="${RDEPEND}
+	>=net-dns/s6-dns-2.3.3.0[static-libs?]
+	ssl? ( >=dev-libs/libressl-3.1.4[static-libs?] )
+"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/usr/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		--enable-shared \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index e332019e410c..3f0f8ce1a0e3 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,4 +1,8 @@
+AUX seafile-client-7.0.9-libressl.patch 558 BLAKE2B 92ab8e75e83a3693861e3b1c4f390fe5287140520867940b2bfa0615f65294cfc0328fd0a285c6e66941e040dc09b8164fb58ab092f5645628811227a30993fc SHA512 67cbcddb7d8610d29fcb308ebd0bc648ad0526101a2540e743232500880f276b0c07f50f20bcdf31d49f422057f99e310a84384ef47f52abe90be8ef0b8b6e6f
+AUX seafile-client-7.0.9-qt-5.15.patch 1036 BLAKE2B dc81224ff712d12c19dc90edb0371853dac4a7c6604f40ae2cc82fbbe59c36d91b776a0e05e31b874b6b5abad84687009d82461e708faa98a3c399b8e0acac11 SHA512 f4a06d788682ccb13ed10485a20322ec074b40dbe4f6f7b9b88f199d6fe64f2dfbaf7f9f7575bbfdd5f309eb58aa9a03453c679b56c52582cdd99ce22b9df57f
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
-DIST seafile-client-7.0.5.tar.gz 2359779 BLAKE2B 58fa532668859c4413bb931146a58eb51ede7c1faa3ea2a9cafb94be44a8819261570ef16cc9f62f584f9ff483aa0832a63a99bb53380dd9efa4f82d25dea553 SHA512 b79cde3f98ebb1a0cb1035131cf95735f01c63bcb4bb658d5c40c36cdf85705d2c6fd2f7787fbdb3d965a25d60ee98e020e33c4f9423295c7ef1ab36ee5c7c27
-EBUILD seafile-client-7.0.5.ebuild 1062 BLAKE2B 6554b553c116a436521026bac9e4d5bd45eea8f919dec85b9e55b4e9ff629523d0ae4076c12c94e8f1af135fa314b927d37cc739b571b92c377cc03b18f30f80 SHA512 f6a0e1ca65fb6d673fbbb3beb384b4d689335d65af051de610fa2a7cb8fabeff5d3db2e5a30014dbf911566eeda9b084901dc50c74e72f4adc49008a8a8b5400
-MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
+DIST seafile-client-7.0.10.tar.gz 2368056 BLAKE2B 8b446a818cc3a238bd92831843f1991632e9417ba92d043065aaf43e2a4d74aa00d331e32136a195558dc780ae124c8b1e7b2b2969f3cff8169635df7470f876 SHA512 cab11292ab1957b1682e0d3ee1ddd8e794c52bba7cf08ed39e8f598d3549247c20214d907d1e3792c06a36d8bea55c0bd25ce9aa3a802c262f9af785da7cb340
+DIST seafile-client-7.0.9.tar.gz 2367747 BLAKE2B 60a488a22e094d4783c7da50e8852d7204e16791613d113f729bacc21a40883edc25469f8ce1a8dab52b4ed0ea73b691a831fb0c01a885aeeae7bd276e2781ff SHA512 665a252a321744cd84b96230f5318528aad23a0a089e5049913c34a6c254356c7cc996e45e2a50d432d114f13b089b8d12062b3a1a4d1a0b6f1cbf9688ad32b6
+EBUILD seafile-client-7.0.10.ebuild 1209 BLAKE2B 2543c25fe156d1b337ba19bbbe5250a46a42e84a58384a1e0e02c23253da75fa98adab3d155089ef9b8edbee01e3a878e3646a2538c38758267d0a81df6608a2 SHA512 67ed286ace247497a574cac503617d20e18b01d3eb848f02dd78fecbaa7112456d0d2b2c2ab475a4ed26586d2f9b77a96c122262e8ef67d70a78c3e9d4fa76be
+EBUILD seafile-client-7.0.9-r1.ebuild 1195 BLAKE2B 4e5370331f2bfdc0007b62203fa167f7cfb3f35369d491fe0eac51375fe01b2714814e7b8a154f0110ea980da0bc487c8efbde77c45b75240a75002c5393bd33 SHA512 457f1bd1be04819ae66a0b097c3df4532497d84bf1ea7a3b903d830ba4e754f8a26959607a0717c0cc98cfed106b58a3905a21b03b91f32e9d7d6b7f94c1c840
+MISC metadata.xml 546 BLAKE2B 26e43bd101f64bdfae0d36dad1035e71f5a0ef31ea3bf5c5bc4b82a9208c892cb7241f50133fa969291e390bbdbd3b9473dc346c65f53d13d4483224e07484c8 SHA512 818714efd9851b566058ae6aba37a7860f0971f54e944f3386e14e9cd2053bca1d18d70ad653051a2c705af6807e5eea656d99eab52263055622c073384e9f83
diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
new file mode 100644
index 000000000000..d7fdc2201d12
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-7.0.9-libressl.patch
@@ -0,0 +1,14 @@
+Upstream pull request: https://github.com/haiwen/seafile-client/pull/1314
+diff --git a/src/utils/rsa.cpp b/src/utils/rsa.cpp
+index 350b790..513733d 100644
+--- a/src/utils/rsa.cpp
++++ b/src/utils/rsa.cpp
+@@ -13,7 +13,7 @@ namespace {
+ 
+ /* Forward compatibility functions if libssl < 1.1.0. */
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
+ 
+ int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+ {
diff --git a/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch
new file mode 100644
index 000000000000..ef9c2f7449b5
--- /dev/null
+++ b/net-misc/seafile-client/files/seafile-client-7.0.9-qt-5.15.patch
@@ -0,0 +1,37 @@
+https://github.com/haiwen/seafile-client/pull/1297
+
+From 86ebea086c6b78738b3140c922c909331d2b9a94 Mon Sep 17 00:00:00 2001
+From: Joffrey <j-off@live.fr>
+Date: Fri, 29 May 2020 15:59:11 +0000
+Subject: [PATCH] Fix build with Qt5 v5.15.0
+
+---
+ src/ui/events-list-view.cpp     | 1 +
+ src/ui/private-share-dialog.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/ui/events-list-view.cpp b/src/ui/events-list-view.cpp
+index b1d04abb..09536b9e 100644
+--- a/src/ui/events-list-view.cpp
++++ b/src/ui/events-list-view.cpp
+@@ -1,4 +1,5 @@
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QApplication>
+ #include <QPixmap>
+ #include <QToolTip>
+diff --git a/src/ui/private-share-dialog.cpp b/src/ui/private-share-dialog.cpp
+index 511d476b..284cc043 100644
+--- a/src/ui/private-share-dialog.cpp
++++ b/src/ui/private-share-dialog.cpp
+@@ -2,6 +2,7 @@
+ #include <QCompleter>
+ #include <QLineEdit>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QResizeEvent>
+ #include <QStringList>
+ #include <QStringListModel>
+-- 
+2.26.2
+
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index f8cd338dfd6d..1c36e673cace 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
diff --git a/net-misc/seafile-client/seafile-client-7.0.10.ebuild b/net-misc/seafile-client/seafile-client-7.0.10.ebuild
new file mode 100644
index 000000000000..e869695c7c6f
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.10.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libevent
+	dev-libs/jansson
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${PN}-7.0.9-libressl.patch"
+	"${FILESDIR}/${PN}-7.0.9-qt-5.15.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile-client/seafile-client-7.0.5.ebuild b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
index c5ac2c442603..649db5f1322d 100644
--- a/net-misc/seafile-client/seafile-client-7.0.5.ebuild
+++ b/net-misc/seafile-client/seafile-client-7.0.9-r1.ebuild
@@ -12,26 +12,31 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="shibboleth test"
+IUSE="libressl shibboleth test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="net-libs/libsearpc
-	~net-misc/seafile-${PV}
+RDEPEND="dev-db/sqlite:3
 	dev-libs/libevent
 	dev-libs/jansson
-	dev-libs/openssl
-	dev-db/sqlite:3
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtnetwork:5
-	dev-qt/qtdbus:5
+	dev-qt/qtwidgets:5
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	net-libs/libsearpc
+	~net-misc/seafile-${PV}
 	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )"
 BDEPEND="dev-qt/linguist-tools:5"
 
-PATCHES=("${FILESDIR}/${PN}-select-qt5.patch")
+PATCHES=(
+	"${FILESDIR}/${PN}-select-qt5.patch"
+	"${FILESDIR}/${P}-libressl.patch"
+	"${FILESDIR}/${P}-qt-5.15.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 611ef58f0634..2ccb88889721 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,3 +1,5 @@
-DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
-EBUILD seafile-7.0.5-r1.ebuild 1081 BLAKE2B ccdf5d4f62b5c003452a1c0ef131aca64bd3e7e2d049ed47d7cada452b5638bdf28b336fc081d625c3c913da394bac1059db28cd4f76562c7679a42ecd5fae7a SHA512 c2617b833851e452bc549936848c34f0941c1b123da09633bfcecd191e6d43d3716ea1f76b5215020ecc1a2e73cc902dc245eaf39fdaaf242d33c5f9eb61026b
-MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
+DIST seafile-7.0.10.tar.gz 707294 BLAKE2B 7f31d09480a7be09c957a79442bc0c952a4b3802fe17d660cb4ae7d157fcb656280751ed5033e399a705fc24c8b0a232e55e5f289792bdb69abec304c85d3473 SHA512 6c5870e75d52f4409fc6f7e3884d3e9208693997b25a6347980a8d164ec6a3348f4b3f5a532f11b9221822aa0ec9125b9d9af8ba7abc4d392cd5b5f602df9289
+DIST seafile-7.0.9.tar.gz 706859 BLAKE2B 2cbd12bfdda9c2cc13d38233a56d0d2f52ad04e03bd14c90c6ff086756fb7ab4f63319906030f9a5f4ec2625dbe23b2892c069f2b5d50c6997b23deaf2cb61d7 SHA512 4c87e7a4a6a4cef631cbfbeb1bde3c8c9e0915d5fe4597d5b3a4b8aa15e9650e97b51ee6a3b0bae4d235ec53149dca01aed7acd704da593c97da0a17e352a75d
+EBUILD seafile-7.0.10.ebuild 1222 BLAKE2B a2a38af895e5e4c745491bb677bce3d46e1e91761ecb99a0269f0a22a5e5b780f840d7a18273fcbbcfed232c665cad873e705cbb35fb8fe83790ce29ff5d8e60 SHA512 7a53c843787eff55e96522ff34acd6aa36d085da316f24dcf083fd0760b25e960397fc69fe0fb4e518795102f5a6e1a700f33d1adf1f02c6cae5ba840509b45e
+EBUILD seafile-7.0.9.ebuild 1149 BLAKE2B 57df7615b831ebd67d1bcefd62bc8a3079027c02db113e2367ebf93f0fb71f4862d8d8bd4e4ff2420a6fa2ebfa6875e56d066cbdd51514eff04dc733a6c10b63 SHA512 d2b4ef7e7c0f2bc6802b1a3d93cf21d6a34d81ddd98c736de49ed8f078901090a3bc77bcb6bd2b09dd4252a08f674a5bf6bf23ad6282a22dd758c3440fce7326
+MISC metadata.xml 447 BLAKE2B c90112a457648a9be79fa0a4858ba7451d86158070a1a4798ac88e3724eb3f39ddef039f904801d460ca607e9143ae7af58bf58a0024d8a6f513055f64fdee43 SHA512 d2af0ed21d876d212283140c20a3192c1d09c88e496c21c455a79962ad20547a9d32688ded73c6951388720e4abb9496afca405aee6ed5ac126f107bea3ee7eb
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
index 36923d5c8719..306e8e51c578 100644
--- a/net-misc/seafile/metadata.xml
+++ b/net-misc/seafile/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@retornaz.com</email>
+		<name>Quentin Retornaz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">haiwen/seafile</remote-id>
 	</upstream>
diff --git a/net-misc/seafile/seafile-7.0.10.ebuild b/net-misc/seafile/seafile-7.0.10.ebuild
new file mode 100644
index 000000000000..5528c543809f
--- /dev/null
+++ b/net-misc/seafile/seafile-7.0.10.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6,7,8,9})
+
+WANT_AUTOMAKE=1.16
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libevent
+	dev-libs/jansson
+	$(python_gen_cond_dep '
+		dev-python/future[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-libs/zlib
+	net-misc/curl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/seafile/seafile-7.0.5-r1.ebuild b/net-misc/seafile/seafile-7.0.9.ebuild
index 7b2a3788f56b..e5d55487b0ad 100644
--- a/net-misc/seafile/seafile-7.0.5-r1.ebuild
+++ b/net-misc/seafile/seafile-7.0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_6)
+PYTHON_COMPAT=(python3_{6,7,8,9})
 
 WANT_AUTOMAKE=1.16
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="libressl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -26,7 +26,8 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/jansson
 	sys-libs/zlib
 	net-misc/curl
-	dev-libs/openssl
+	!libressl? ( dev-libs/openssl )
+	libressl? ( dev-libs/libressl )
 	dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	$(vala_depend)"
@@ -40,7 +41,7 @@ src_prepare() {
 
 src_install() {
 	default
-	# Remove unnecessary files, as recommended by ltprune.eclass
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
 	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 	python_fix_shebang "${ED}"/usr/bin
 }
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index 24194ee02df0..f16049529ee1 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,4 +1,6 @@
 AUX 0.9.6_p1-callback.patch 490 BLAKE2B 398728ea4fb79a0c8ab2e1920f08186df358bb7924674a38526432c487d453b4a679b731692cc06cff0e10b76b3558462901bf367993d0dbe90bb0d9dd8e739a SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a
 DIST sipsak-0.9.6-1.tar.gz 158776 BLAKE2B c8bd37d63d55bc593a57455171ed2dd26c8a4e87746be7075af7c2912b400d49a44f25fad694e296c75ea9aa3e7b10cc81a457c448a3a9429a41d22b84fb794c SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
+DIST sipsak-0.9.7.tar.gz 199074 BLAKE2B c99bc7ace4eb5f1af193d64d156243904300e1f5fc66d1a44f578970e0d8242be3c8fa82804bfc975efcaaf6b5289c0b09b22b8d5c069fc81a16c343136be49b SHA512 695ba6e596411fdda14e6800163b934dba2dc6ee661ebc91a9f3d3509b9568d0482108fb50503953f7f9186cf11724c0faf4660436aad1929f4a70dc41286402
 EBUILD sipsak-0.9.6_p1-r2.ebuild 758 BLAKE2B 865664393847d687882c8d49b2bc833aa614afe0d5ef3aaa1633c591d791f02c08bdf72339c4a249f34810cef55028f5dd58fb3543b49e8ac31e46810eba41c8 SHA512 4503bf957062070935e67e2814d9d4f06731b81171865ff7ce09895e1d23ac85ca59ddc0cb8705b4dfb2b096f719c4fde1b446fe42f02ee23b6e7a4b6f73289b
+EBUILD sipsak-0.9.7.ebuild 642 BLAKE2B 6c85a165082b82feec2bf82b160bba7e64a669937a143b336e00975210770dab26be1bd89c2f21c0279a686526f5bcf892de8c890e165c208aad86f37970612f SHA512 155b33b914e3ba9b2719c9a6784dd97947e0c220b11f373f1306f7496b18d1c9684244bc5af420010afe7f32e7802b0d13bcad1824c3da9e46d0c80404ecf5fe
 MISC metadata.xml 303 BLAKE2B cc764a44b688e208776c7e99220318ff09e0cafc4b49a9b8e1d105766425f7c4fe59d85fdee39601ef066d59669eb8e6259cb755f997d400e1a8e13366a2bc55 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4
diff --git a/net-misc/sipsak/sipsak-0.9.7.ebuild b/net-misc/sipsak/sipsak-0.9.7.ebuild
new file mode 100644
index 000000000000..ddc1785dbe0a
--- /dev/null
+++ b/net-misc/sipsak/sipsak-0.9.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="small command line tool for testing SIP applications and devices"
+HOMEPAGE="https://github.com/nils-ohlmeier/sipsak"
+SRC_URI="https://github.com/nils-ohlmeier/sipsak/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="net-libs/gnutls
+	net-dns/c-ares"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	append-cflags -std=gnu89 -fcommon
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index a2d499dd22ca..6ca3ede511cd 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,14 +1,13 @@
 AUX sks-1.1.6-unbundle-cryptokit.patch 2051 BLAKE2B 6d9f7e499ab281f3f233fce5e8d7b18fdc05dd5f596a26c0fd2a09a9c3db846db0785c31141948e048853a947b300983757be92a5970b14ae6d3a41a41d084a2 SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4
-AUX sks-1.1.6-use-ocamlfind.patch 1259 BLAKE2B 1c1539612b70ad0f35478bd8952926b7bd9bb8d9864fa9964668e315a4488a9ecb8debbecb8892566abd83a081175aba0335d01de4885421c018c3cc52430aad SHA512 7fff2dbcad7f3c73e53b99d856cb1da52125e5dc51b84959be9ddc555dc34e1e39a049aa3946f350a15d9a5ed74f4bc0a58f2ea3523c4cc3675bf3901db11238
-AUX sks-1.1.6-use-ocamlfind2.patch 671 BLAKE2B 04c36f4f2955b7f3256fed668f945966cdddf8f67054031589bf1efedb486ca03b4746269ff314571fff32013613b45d751bb0b9cd0605c1ec808cfc3fc29bdb SHA512 555a688be1e4bb1c7fb2e1bbeb4661e6dd0bc04d94a2ff3c5a12e7979549efc79531ee8cba01f6150610b633cce20072367a42eda2870f0755adf69b24cfaa7f
-AUX sks-1.1.6-use-ocamlfind3.patch 665 BLAKE2B 011922893b145d2d619e93ec3baf5117e0273289256228b895c54f9ef48300ef524640faec5f037393ab7f3880774a306b0033d03e545874a9f14f6d8523591b SHA512 cae267036bbe65701f06a1aec4f3cfb30d7a8f5bd8859d8eaa73b2d66438b5fe0c6ceb42cc810951dd4233b0b162091dcfd760ff9c22b3a3e39ed99e239ca13a
+AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd7721be01e29e0822c5512ac8c033b215ecf3c92ea97e0f5aeae02343d5efbbba05c87c4ff28b994d0c3b7b8974210d9ca1984 SHA512 8b384f82df6348df31710de1e2c6fabc8979daee2bf6f83a87399f63adbbd4a40f7bb99247caba343b45eb30fdf2e4bbb3d769974003bda264c484f35b6c5974
+AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088
 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6
 AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cbeaf22e6278922ef34daf9dbda14217377f12c831836a64b4e1a9b4868be41db834fa024a59be35b SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e
 AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fdb79a8e75facbcf256dfdaff8ebf4f4f04885e0d0e52591cc0c3b1c0e0ed84fbd39c2f7ab8cd2bf4d SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c
 AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef
 AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660
 DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099
+DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a
 EBUILD sks-1.1.6-r2.ebuild 3677 BLAKE2B 354a2b89fcab9050ba7551ecff8da54b5ab8011605e936157396cde5cda30855a341042a9654737b26722fba81964036be394b048d3360ad99a075c0b1145a39 SHA512 0b37213e24548699dec3874a7e2bb9185df65d701f67f13ec7584ecde220c32a95aa9b7012fe2dee2fcd8a7972541dd0c785a5b17daaca976c0ced61699e4c59
-EBUILD sks-1.1.6-r4.ebuild 3546 BLAKE2B 8be2010b861536d6ac2307648728e54e5d2b9cc254252ffc3d88de1ef93cf38fa4bbd4a512ccf75378987319bddf142e8d91a2d656191f1f15904e9aae38a372 SHA512 2dbc5eb84b4d4b00c6ec2b01bd7f2323ab916337f9bdf10f06ba9b7d500c4b64b4625613cbd3e1755275ff44ff85d366c824b42fa51c18b88ef6985a537f8cce
-EBUILD sks-1.1.6-r5.ebuild 3689 BLAKE2B 5b1b9cb2b694b8e8415e29e93c0276d42e81f22873c721f67676a82f5da3de0d4b4026e72fd9275f70d2e3375ac974ac6a5597317d43c54654678600b4277afc SHA512 b9f0db5da7805b6748ca118c3feaf88f84ab1fa8a12ad7cf6d47547557a414d8240398577b5e6beaf8d2d08ea0a1c02f34685a1071c1a72df2a1b9c528830580
-MISC metadata.xml 337 BLAKE2B 136350a55fd572e1bec89457974f2d2722af1a74ae710bab541f1979d3294e6f44b1519e13ddcba242807d6d2f96ac11071126facdec62597d3201327e84e7f9 SHA512 977596797db2915f728f8c6661a5c90a3348691b357f0e2c9ddab662cc50bd8e426bc35f14e9a8ffa3ad6938fc206859e865fd9f4f6a02f45f377a1adec7d38b
+EBUILD sks-1.1.6_p20200624.ebuild 3761 BLAKE2B 95d5e7e41d505c0ee5b8cc6fd555e4fe62bbce317c71ea71b44b5cd4ddcff1d9cf1db514a689aac4df42252edead5953eadb39dbc7513281dcbbf0a144e5b922 SHA512 5aeb17f34e1a52649c92565385d40ec892accf05f39e7fd0240c8ffa2f8d3eb6cc116bb5ab52448f3755280e25a86acb9f68c323255baa59c716ef9cda9b7bec
+MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch
deleted file mode 100644
index c9afc2594091..000000000000
--- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Use ocamlfind for finding dependencies, esp. for doing their transitive closure.
-
-Ideally the build system should be converted to something more modern like
-jbuilder.
-
-Index: sks-1.1.6/Makefile
-===================================================================
---- sks-1.1.6.orig/Makefile
-+++ sks-1.1.6/Makefile
-@@ -21,10 +21,10 @@ CFLAGS=-O3  $(CINCLUDES) -I .
- CXXFLAGS=-O3 $(CINCLUDES) -I .
- 
- ifndef OCAMLC
--	OCAMLC=ocamlc
-+	OCAMLC=ocamlfind ocamlc
- endif
- ifndef OCAMLOPT
--	OCAMLOPT=ocamlopt
-+	OCAMLOPT=ocamlfind ocamlopt
- endif
- ifndef CAMLP4O
- 	CAMLP4O=camlp4o
-@@ -55,12 +55,12 @@ WARNERR=-warn-error A
- endif
- 
- CAMLP4=-pp $(CAMLP4O)
--CAMLINCLUDE= -I lib -I bdb -I +cryptokit
-+CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
- OCAMLDEP=ocamldep $(CAMLP4)
--CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
--OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
--OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa)
-+CAMLLIBS=bdb.cma nums.cma
-+OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
-+OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
- 
- EXE=sks sks_add_mail
- ALL=$(EXE) sks.8.gz
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
deleted file mode 100644
index 1fba250fd4b3..000000000000
--- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
-# Date 1499610580 -7200
-# Node ID 719ffdf628a81a2f052f3b6dc746a3e1d37afe30
-# Parent  6352f0dbcadf35aac29c2fbf10fb218ae50d9c77
-Fix nums specification
-
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@
- CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
- OCAMLDEP=ocamldep $(CAMLP4)
--CAMLLIBS=bdb.cma nums.cma
-+CAMLLIBS=bdb.cma
- OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
- OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
- 
diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
deleted file mode 100644
index ea5a82db6530..000000000000
--- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Kristian Fiskerstrand <kf@sumptuouscapital.com>
-# Date 1499612080 -7200
-# Node ID 0106ba2f6abc8ee2f685026d3f218730114a60fa
-# Parent  719ffdf628a81a2f052f3b6dc746a3e1d37afe30
-Add num to findlib packages
-
-Although nums is detected, making this explicit
-
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -53,7 +53,7 @@
- endif
- 
- CAMLP4=-pp $(CAMLP4O)
--CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb
-+CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I lib -I bdb
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR)
- OCAMLDEP=ocamldep $(CAMLP4)
- CAMLLIBS=bdb.cma
diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch
new file mode 100644
index 000000000000..3657a8bd5f07
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch
@@ -0,0 +1,71 @@
+diff --git a/Makefile b/Makefile
+index f182225..c84368e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,8 +15,8 @@
+ #   USA
+ #
+ CINCLUDES=-I$(shell ocamlc -where)
+-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+-CXXFLAGS+=-O3 $(CINCLUDES) -I .
++CFLAGS+=$(CINCLUDES) -I .
++CXXFLAGS+=$(CINCLUDES) -I .
+ 
+ ifndef OCAMLC
+ 	OCAMLC=ocamlfind ocamlc
+@@ -60,8 +60,8 @@ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa)
+ 
+ EXE=sks sks_add_mail
+-ALL=$(EXE) sks.8.gz
+-ALL.bc=$(EXE:=.bc) sks.8.gz
++ALL=$(EXE) sks.8
++ALL.bc=$(EXE:=.bc) sks.8
+ 
+ all: $(ALL)
+ all.bc: $(ALL.bc)
+@@ -132,13 +132,13 @@ install:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8
+-	install sks.8.gz $(DESTDIR)$(MANDIR)/man8
++	install sks.8 $(DESTDIR)$(MANDIR)/man8
+ 
+ install.bc:
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8
+-	install sks.8.gz $(DESTDIR)$(MANDIR)/man8
++	install sks.8 $(DESTDIR)$(MANDIR)/man8
+ 
+ 
+ Makefile.local:
+@@ -151,9 +151,6 @@ src:
+ 
+ # Ordinary targets
+ 
+-sks.8.gz: sks.8
+-	gzip -9nf sks.8
+-
+ sks.8: sks.pod
+ 	pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8
+ 
+diff --git a/bdb/Makefile b/bdb/Makefile
+index 0913014..4a68399 100644
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -15,11 +15,11 @@
+ -include ../Makefile.local
+ 
+ CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
+-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+-CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
++CFLAGS+=$(CINCLUDES) $(BDBLIB) -I .
++CXXFLAGS+=$(CINCLUDES) $(BDBLIB) -I .
+ 
+ MKLIB=ocamlmklib
+-RANLIB=ranlib
++RANLIB?=ranlib
+ OCAMLDEP=ocamldep $(PP)
+ CAMLINCLUDE=
+ COMMONCAMLFLAGS= $(CAMLINCLUDE) $(PP) #-thread
diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch
new file mode 100644
index 000000000000..02da8d2d2e76
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch
@@ -0,0 +1,81 @@
+https://sources.debian.org/src/sks/1.1.6+git20200620.9e9d504-1/debian/patches/0008-accept-and-use-CFLAGS-and-CPPFLAGS-from-environment.patch/
+----
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Mon, 8 Aug 2016 13:20:38 -0400
+Subject: accept and use CFLAGS and CPPFLAGS from environment
+
+---
+ Makefile     |  9 +++++----
+ bdb/Makefile | 14 ++++++++------
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@
+ #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ #   USA
+ #
+-CINCLUDES=-I`ocamlc -where`
++CINCLUDES=-I$(shell ocamlc -where)
+ CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+ CXXFLAGS+=-O3 $(CINCLUDES) -I .
+ 
+@@ -43,6 +43,7 @@ else
+ endif
+ 
+ CAMLLDFLAGS=$(foreach x, $(LDFLAGS), -ccopt $(x))
++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
+ 
+ SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
+ ifeq ($(strip $(SKSVS)),)
+@@ -52,7 +53,7 @@ WARNERR=-warn-error A
+ endif
+ 
+ CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I bdb
+-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR)
++COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLCFLAGS) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR)
+ OCAMLDEP=ocamldep
+ CAMLLIBS=bdb.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS)
+--- a/bdb/Makefile
++++ b/bdb/Makefile
+@@ -14,7 +14,7 @@
+ # $Id: Makefile,v 1.6 2003/07/05 15:16:29 yminsky Exp $
+ -include ../Makefile.local
+ 
+-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
++CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE)
+ CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+ CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I .
+ 
+@@ -27,6 +27,8 @@ CAMLLIBS=unix.cma str.cma mylibs.cma
+ OCAMLFLAGS=$(COMMONCAMLFLAGS) -g
+ OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40
+ 
++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x))
++
+ ifndef LIBDB
+ LIBDB=-ldb-4.6
+ endif
+@@ -37,7 +39,7 @@ ocextr: ocextr.ml
+ 	$(OCAMLC) -o ocextr ocextr.ml
+ 
+ libbdb.a: $(COBJS)
+-	$(MKLIB) -custom -o bdb $(COBJS)
++	$(MKLIB) $(CAMLCFLAGS) -custom -o bdb $(COBJS)
+ 
+ bdb_stubs.o: bdb_stubs.h bdb_stubs.c
+ 
+@@ -45,10 +47,10 @@ bdb.ml: ocextr bdb_stubs.c
+ 	./ocextr bdb_stubs.c > bdb.ml
+ 
+ bdb.cma: bdb.cmo libbdb.a
+-	$(MKLIB) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
++	$(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmo -lbdb $(LIBDB)
+ 
+ bdb.cmxa: bdb.cmx libbdb.a
+-	$(MKLIB) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
++	$(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmx -lbdb $(LIBDB)
+ 
+ bdbcaml: bdb.cma
+ 	ocamlmktop -o bdbcaml -custom unix.cma bdb.cma $^
diff --git a/net-misc/sks/metadata.xml b/net-misc/sks/metadata.xml
index 7bc958a5ed9b..5b240d62d857 100644
--- a/net-misc/sks/metadata.xml
+++ b/net-misc/sks/metadata.xml
@@ -6,6 +6,6 @@
 		<flag name="optimize">Enables bytecode optimization</flag>
 	</use>
 	<upstream>
-		<remote-id type="bitbucket">skskeyserver/sks-keyserver</remote-id>
+		<remote-id type="github">SKS-Keyserver/sks-keyserver</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild
deleted file mode 100644
index 89cc2ec999a4..000000000000
--- a/net-misc/sks/sks-1.1.6-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib user readme.gentoo-r1 systemd
-
-DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="optimize test"
-RESTRICT="!test? ( test )"
-DOC_CONTENTS="To get sks running, first build the database,
-start the database, import atleast one key, then
-run a cleandb. See the sks man page for more information
-Typical DB_CONFIG file and sksconf has been installed
-in /var/lib/sks and can be used as templates by renaming
-to remove the .typical extension. The DB_CONFIG file has
-to be in place before doing the database build, or the BDB
-environment has to be manually cleared from both KDB and PTree.
-The same applies if you are upgrading to this version with an existing KDB/Ptree,
-using another version of BDB than 4.8; you need to clear the environment
-using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
-Additionally a sample web interface has been installed as
-web.typical in /var/lib/sks that can be used by renaming it to web
-Important: It is strongly recommended to set up SKS behind a
-reverse proxy. Instructions on properly configuring SKS can be
-found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
-
-RDEPEND=">=dev-lang/ocaml-4.0:=
-	dev-ml/camlp4:=
-	dev-ml/cryptokit:=
-	sys-libs/db:5.3"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
-		   "${FILESDIR}/${P}-use-ocamlfind.patch"
-	cp Makefile.local.unused Makefile.local || die
-	sed -i \
-		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
-		-e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
-		-e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
-		-e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
-		-e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
-		Makefile.local || die
-	sed -i \
-		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
-		sks_build.sh || die
-	eapply_user
-}
-
-src_compile() {
-	emake dep
-	# sks build fails with paralell build in module Bdb
-	emake -j1 all
-	if use optimize; then
-		emake all.bc
-	fi
-}
-
-src_test() {
-	./sks unit_test || die
-}
-
-src_install() {
-	if use optimize; then
-		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
-	else
-		emake install
-	fi
-
-	dodoc README.md
-
-	newinitd "${FILESDIR}/sks-db.initd" sks-db
-	newinitd "${FILESDIR}/sks-recon.initd" sks-recon
-	newconfd "${FILESDIR}/sks.confd" sks
-	systemd_dounit "${FILESDIR}"/sks-db.service
-	systemd_dounit "${FILESDIR}"/sks-recon.service
-
-	dodir "/var/lib/sks/web.typical"
-	insinto /var/lib/sks
-	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
-	newins sampleConfig/sksconf.typical sksconf.typical
-	insinto /var/lib/sks/web.typical
-	doins sampleWeb/HTML5/*
-
-	keepdir /var/lib/sks
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
-		einfo "The default values for pagesize settings have changed. To continue"
-		einfo "using an existing DB without rebuilding, explicit settings have to be"
-		einfo "added to the sksconf file."
-		einfo "pagesize:       4"
-		einfo "ptree_pagesize: 1"
-	fi;
-}
diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild
index 6555ea2c8bf6..7c9d13994f7d 100644
--- a/net-misc/sks/sks-1.1.6-r5.ebuild
+++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib user readme.gentoo-r1 systemd
+inherit readme.gentoo-r1 systemd toolchain-funcs
 
+COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7"
 DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
-HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
-SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
+HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver"
+SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-keyserver-${COMMIT}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="optimize test"
 RESTRICT="!test? ( test )"
+
 DOC_CONTENTS="To get sks running, first build the database,
 start the database, import atleast one key, then
 run a cleandb. See the sks man page for more information
@@ -30,25 +34,28 @@ Important: It is strongly recommended to set up SKS behind a
 reverse proxy. Instructions on properly configuring SKS can be
 found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
 
-RDEPEND=">=dev-lang/ocaml-4.0:=
+RDEPEND="
+	acct-user/sks
+	acct-group/sks
+	>=dev-lang/ocaml-4.0:=
 	dev-ml/camlp4:=
 	dev-ml/cryptokit:=
-	sys-libs/db:5.3"
+	dev-ml/num:=
+	sys-libs/db:5.3
+"
 DEPEND="${RDEPEND}
 	dev-ml/findlib"
 
-pkg_setup() {
-	ebegin "Creating named group and user"
-	enewgroup sks
-	enewuser sks -1 -1 /var/lib/sks sks
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch"
+	"${FILESDIR}/${PN}-1.1.6_p20200624-QA-fixups.patch"
+)
 
-src_prepare() {
-	eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
-			"${FILESDIR}/${P}-use-ocamlfind.patch" \
-			"${FILESDIR}/${P}-use-ocamlfind2.patch" \
-			"${FILESDIR}/${P}-use-ocamlfind3.patch"
+QA_FLAGS_IGNORED=(
+	/usr/bin/sks_add_mail
+)
 
+src_prepare() {
 	cp Makefile.local.unused Makefile.local || die
 	sed -i \
 		-e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
@@ -60,13 +67,16 @@ src_prepare() {
 	sed -i \
 		-e 's:/usr/sbin/sks:/usr/bin/sks:g' \
 		sks_build.sh || die
-	dosym /usr/bin/sks_build.sh /usr/bin/sks_build.bc.sh
-	eapply_user
+
+	dosym sks_build.sh /usr/bin/sks_build.bc.sh
+	default
 }
 
 src_compile() {
+	tc-export CC CXX RANLIB
+
 	emake dep
-	# sks build fails with paralell build in module Bdb
+	# sks build fails with parallel build in module Bdb
 	emake -j1 all
 	if use optimize; then
 		emake all.bc
@@ -80,8 +90,8 @@ src_test() {
 src_install() {
 	if use optimize; then
 		emake install.bc
-		dosym /usr/bin/sks.bc usr/bin/sks
-		dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
+		dosym sks.bc usr/bin/sks
+		dosym sks_add_mail.bc usr/bin/sks_add_mail
 	else
 		emake install
 	fi
@@ -95,7 +105,10 @@ src_install() {
 	systemd_dounit "${FILESDIR}"/sks-recon.service
 
 	dodir "/var/lib/sks/web.typical"
+
 	insinto /var/lib/sks
+	fowners sks:sks /var/lib/sks
+
 	newins sampleConfig/DB_CONFIG DB_CONFIG.typical
 	newins sampleConfig/sksconf.typical sksconf.typical
 	insinto /var/lib/sks/web.typical
@@ -108,7 +121,7 @@ src_install() {
 pkg_postinst() {
 	readme.gentoo_print_elog
 
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
 		einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
 		einfo "The default values for pagesize settings have changed. To continue"
 		einfo "using an existing DB without rebuilding, explicit settings have to be"
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 4ccf68a994cb..8f60d757d638 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,3 @@
 DIST smb4k-3.0.6.tar.xz 3842424 BLAKE2B 7c42007a00b3da07bdc1629360bb8640c66ac7332fefca82698664cf197d4061d6c4419ab99ebd29e6515dace194973be2c179fa3c422820716fc5e5e1b8591f SHA512 993f669c12db30dd78f9f6cc694dfe563958407582f65ff64b6ada36cf4372ad6bb5addecc93970ce6750d031bf4ee9dfefa362e13100d2ce8d3e848a0d89382
-EBUILD smb4k-3.0.6.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea
+EBUILD smb4k-3.0.6.ebuild 1863 BLAKE2B 9f9a74efd627fb11a2a4eb4181776e7727594ae00bcdf6e7083dff17f864428dd6e25f00c78fcfcab482fa4293261586ed012e8ce7ede0ca70b3c8a39b0d0b8b SHA512 c99a37ca1bb9e0bd5090153e4becb9d5aa1eccb8142b0f0371c06e358fbde5307d13865e7d0eb37d2cd4f786c9e543122368e11f70b6fadf4bed8adc94e4c3ec
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.6.ebuild b/net-misc/smb4k/smb4k-3.0.6.ebuild
index 169b71b8637d..758dd644103f 100644
--- a/net-misc/smb4k/smb4k-3.0.6.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.6.ebuild
@@ -9,7 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.smb4k
+HOMEPAGE="https://apps.kde.org/en/smb4k
 https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/net-misc/sntpd/Manifest b/net-misc/sntpd/Manifest
index 0367781edab0..9aaecf587f69 100644
--- a/net-misc/sntpd/Manifest
+++ b/net-misc/sntpd/Manifest
@@ -1,8 +1,5 @@
-AUX ntpclient-2018.244-linux-headers-5.2.patch 298 BLAKE2B bf39e7f0300b925a468c423d2ed6d41bb646ff4b034e264784e64fc6aeb9497c40154e21b1a76930104d2f62b8cdfa3d17ba3abdbbfefe95a3329438a009938d SHA512 dc92198426f3a859c5ff2618f754c279aa24e147ec0b165baa85af213c42bf011e7f2f13e33116839fc5b8fdc7e79405f113cee253bc5adbfb2fa40cbc6c3596
 AUX sntpd.confd 243 BLAKE2B fc2d82b48e8b57e346ebe5fc65750368b09dce96dadbc159033d7181e9bf0a71794969b24310975b72d10faa22753ca3cc751c03b3f0775aa085f39d87f695f0 SHA512 b2ecb3e96418d36504c8ceab5ec88f7415e7fc32c00bd9fee0eb6fb643f207b5c0e481427e1fdb7a3e52a5bc2619b67363e7c27dd48e67eab61910906b86df3f
 AUX sntpd.initd-r1 281 BLAKE2B e16573772a24d6c6380dcb769a2f87f73249aff34c4bc6ffa67700374ede21ba318d0d5c0c444f304cbea5feb613a2eb70d07e8aebf5fe291f3da0358becc487 SHA512 38d3950d774132114fe7270c8c39a44428e89372bcdb7833cef75e5775579dc88679b9f167ed29e3e7e620927a0365d2de7c94fb263b414439deb061a8c1db9d
-DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
 DIST sntpd-3.0.tar.gz 151995 BLAKE2B a67615c874fd119e083d99d269a92a550d875a18a973e0b2904cab1fe6631b6c4e98d86959fbd9c1a387396f1854ed1c264920e2b40e6355871cbc8a4e40a4b5 SHA512 664e95e590b329dc847275c99829711c159bf91fadb2a90989c2706fbd8b074480146a7a05c5532a1bbfcaebd4b489262a44e418fa8ac57362c4f7db659fd1ea
-EBUILD sntpd-2.2018.244-r1.ebuild 861 BLAKE2B 453645dce4a010fa7b58164ee9229204e5b697754320e5b31c0d8fa27229fbe2e21022343585e2503e8074e40fd4d278ec6e7288285e8de428e857631066c05f SHA512 4062ce0572a597f336009fd11104f7f6aaac43aef17b41ab77978089aacdb780245bf96d5aa2125a68cab41b13753593257462eb4fbd6ba078eb3f1f0cdc9d70
-EBUILD sntpd-3.0-r1.ebuild 823 BLAKE2B 2e314e506b3a825efa31f5471cbedad7c3f9bd9b66212a32d9d0eaedd112e1851615ccd644ea52164ca0451e54e81aed1cb83bd45c69cf71ca79d14fb9a3f71c SHA512 09e33d85196ee16be8fd04a68c99ccf745167d6a0eedf322a145e46488c916b2240ded3d268beee4ac77d2857eb0c4cad7cf2c9718910d2a7737a268ffc7f5d7
-MISC metadata.xml 1215 BLAKE2B ea6284bde03ea2157cd105851ad90a1a2cf379bc6b5f0742866d25fdb2997e0875dcb350984daa79b63625b525d1b53cde28b3fa47220591540a165955273fc4 SHA512 eba1d1787f52e8101cb64df313df7eb3ddc2e6b593d9acbc8b5a8accacdd6d7b0fd02c4b73e65ffd73fce1bbbd10f3d206989e5b2d5280ad84aac97506568659
+EBUILD sntpd-3.0-r1.ebuild 821 BLAKE2B b570f1fafb14542109ca188078b5921f1dbe386d842625ce7292424a0f27fcefc3e476d8030d63062b4f6c6d8d06688bf64215b9af2740de87d42237f9c304e0 SHA512 6f7f2996d5f7101025dfd2be61fe89048cc69afa1e7e63a6006479374f1c295cd3d8d824aa4d4399096987b27d391a660ab56dde60661a300f254c1580480eb7
+MISC metadata.xml 863 BLAKE2B 91a39d6197e120dee085cb419b126f01635aac9a4a0cd03c6431d6ba33b11b55b8017daba6d2235ce1d7a5abd54c4c4c6fb7691a0ba271a2e9435b519debbb2c SHA512 cef3ed6698c5827937d672c11723ee3a5bbcd073143decff45cd2a63bf1035677cb41b01b79338a69a61927495967c15e25f17c5e3a56f065e765845830e0987
diff --git a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch b/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
deleted file mode 100644
index df87cb6ceb22..000000000000
--- a/net-misc/sntpd/files/ntpclient-2018.244-linux-headers-5.2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/ntpclient.c	2018-08-27 20:38:12.000000000 +0200
-+++ b/src/ntpclient.c	2019-08-19 20:11:59.000000000 +0200
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <errno.h>
- #ifdef PRECISION_SIOCGSTAMP
-+#include <linux/sockios.h>
- #include <sys/ioctl.h>
- #endif
- #ifdef USE_OBSOLETE_GETTIMEOFDAY
diff --git a/net-misc/sntpd/metadata.xml b/net-misc/sntpd/metadata.xml
index 0d0a5d1ae349..9bb3f3c88e32 100644
--- a/net-misc/sntpd/metadata.xml
+++ b/net-misc/sntpd/metadata.xml
@@ -19,9 +19,5 @@
 	</upstream>
 	<use>
 		<flag name="adjtimex">Install adjtimex for the clock adjustment algorithm.</flag>
-		<flag name="debug">Enable analysis code path and debugging of NTP protocol.</flag>
-		<flag name="embedded">Build a very small ntpclient, from OpenWRT project.</flag>
-		<flag name="obsolete">Enable obsolete features, to use with kernel versions older than 3.0</flag>
-		<flag name="syslog">Enable logging to syslog instead of logging to stderr.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild b/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
deleted file mode 100644
index f6b938200cc1..000000000000
--- a/net-misc/sntpd/sntpd-2.2018.244-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="ntpclient"
-MY_PV="${PV/2./}"
-MY_P="${MY_PN}-${MY_PV/./_}"
-
-DESCRIPTION="A NTP (RFC-1305 and RFC-4330) client for unix-alike systems"
-HOMEPAGE="https://github.com/troglobit/sntpd"
-SRC_URI="https://github.com/troglobit/sntpd/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="debug embedded obsolete +syslog"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${MY_PN}-${MY_PV}-linux-headers-5.2.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug replay)
-		$(use_enable embedded mini)
-		$(use_enable obsolete)
-		$(use_enable !obsolete siocgstamp)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-misc/sntpd/sntpd-3.0-r1.ebuild b/net-misc/sntpd/sntpd-3.0-r1.ebuild
index 5edf61d7f025..7736ca2eb8bf 100644
--- a/net-misc/sntpd/sntpd-3.0-r1.ebuild
+++ b/net-misc/sntpd/sntpd-3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="adjtimex systemd"
 
 RDEPEND="systemd? ( sys-apps/systemd )"
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 877ae7b1e692..a920d8519974 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -8,4 +8,4 @@ DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b6
 EBUILD socat-1.7.3.4.ebuild 1469 BLAKE2B b684ac8a85ad1f08fcb39a417c8d8775590d9eb6ee0ee532a78c28b0f6afd26989111468be9100aa6a44741e95cc0c3e82de02dbbb8105b45c1939ddc5760350 SHA512 19ef1680249be8dc416126a83c1651dd7da6182dae171eec5a819c1a026f9f8f84bf8d1eada092086da26cff103a1481d16cd649aaf7ba39e79d91e124f6a9f1
 EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18
 EBUILD socat-9999.ebuild 1395 BLAKE2B 0884f6b4f865dc2ff255e5a48a45c0de198b3b926db598d18472758767c6a7e10978a59a88b7ec543bd1f5b8b4a18aa67b42bf59cbd3ecaf2696e83932940b53 SHA512 8836b32f18f8680bf27c26c10ac996d14befcea2f1f2ba6aab2f5e433e757ec51e81a0bebfced410c7e07f3cbd9704af7f349441530e223d132ccb5c78a3cc20
-MISC metadata.xml 367 BLAKE2B bcbf5f31a96ed1a9a966131bd0e9ba1baa1ef371c4cfc8c6ad623884cf23773ee1987a590381a6edb0671ea32ad34834fd3a3d23ae123bdb86eb8a9f3e28de78 SHA512 d3960b46fbdd0bac70f454d2ecb2fc033ff508e8752e42e2cfbdbe4f49b21e1f818a404b0b4187a72c79f0d717ef5ed4cac657e5fe58879fa90123d26c1c7601
+MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 70bb6410439c..b367792e3e30 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 0ca82e5a5789..6561168aaa34 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,4 +1,4 @@
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
 DIST ssh-askpass-fullscreen-1.2.tar.gz 101597 BLAKE2B 86c632f83d99ed3d6934b921e499fdb75821659d5b54d380a9d7b04355b93602a481e94320d795b614f2e4c67e7a3ffe1e8380065840e31cb9f5e29c5ae8a75d SHA512 478ae81d8d8b174f9a7ba8f7071aca80503ee3ceed945f12fc44f69d08df4ede010de64ab96cacc901b5b29f4a0e4efb86c220e40f2903b8a4306acc4381f88d
-EBUILD ssh-askpass-fullscreen-1.2.ebuild 965 BLAKE2B 1d122f4b01249363c7bd08afc56bf699d578a3d7d3409c21033f6cfd899ea5e67850917acc1136103f0eeb4fc6ef64f746a0fa258f2c0788b090399a997c4a84 SHA512 248b82cef128623d5e45c852809cdeeb4884f448e6c0947c5360586ec83e5cbe08c983bdf0667e221e5ad84275115fa1e5a8a8f637eddd7901ad948c5d5850d5
+EBUILD ssh-askpass-fullscreen-1.2.ebuild 970 BLAKE2B 2543c52bd21888edc9c8a7ff2df28350fe646338e40b74b25e5bb397e225bf9c2d2d6a4c0786296d7e3e2a801d1b911e11fa9f94d0a5dd5ef9b4668fff9a14d1 SHA512 5b28e72da7288ecd9352d97b78eaba383a99abf37c6d31dfb2b0fb7a2d262bc9ec0deeac9bdb9db299e7011e44f8d60d058caa1e0717583b3c9f9da75a2146f7
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
index 07e2e0b9e2bf..a1e8c7c4af9c 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atj/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.10.0:2
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 115ed3d64227..75437b807d85 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,3 +1,3 @@
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
-EBUILD sshpass-1.06.ebuild 407 BLAKE2B 87d1dd1098ae24d29b5c7776e73fbb4cf59590bc4c8dbb96db713fef6eeaf4d6dbac454532db5d3a8a28f4d821ef5113450bcc4c988f71a34898383eec85a84e SHA512 1acc6a26373c27a52018e954cf81797ec948d379b495c1389dec90e9cc54762ed621a33fbd6d5285a549653632bb7e5e5098460056cd502031a7a92bdceccdf0
+EBUILD sshpass-1.06.ebuild 406 BLAKE2B de3989b3329a4a26c1a335b945317560bcc23832526606b223e22e94664e47a6162c49730d3732da029423d6038e36755ba1035619e5f51a3a8dd173beaa6115 SHA512 d9db0ce62c5c2f376afdd36922114e329168989d1e8c25466a02545a6bd39900930fbd0b9b6d54660ad500ccbf034ecc39a4675291360652a30d63111798cabe
 MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
index c2e5df13fa4f..f9199471e16e 100644
--- a/net-misc/sshpass/sshpass-1.06.ebuild
+++ b/net-misc/sshpass/sshpass-1.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="net-misc/openssh"
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index cb820e229213..c8d2f1809900 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -16,5 +16,5 @@ EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14
 EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e85159a9e4a282ea8ea74c0279e39dc7c5933f8f07883cb57d788cbddf7efb33aebf299c2ee23555fac30fbb6a17b47864 SHA512 177d58dc814db1a593af2f1f64871d8964d4bbdf67f56017dfe0ba60b12fe5f9225e9ff72320f0e0b5e18cb767db814b4ab30f9945729cc3b9bac1d83c20a3de
 EBUILD teamviewer-15.3.2682.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
 EBUILD teamviewer-15.4.4445.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
-EBUILD teamviewer-15.5.3.ebuild 4095 BLAKE2B a2b2296669187cd8fe80b0ca044cab0ca1e155a9d48b04a49c06af5c1bff24b3f2378d093b3dc386ffc7f39741a44b02e85b9f75ee2c49338ae117dd6018f1e2 SHA512 993d28827b01ca441943b16aee7adb3ecb88274f4305bc3383370569466fe01f93ccfe4c6444afcd2578dc22f0fd63c52f21c9c239451ea8ad7f3414583dc736
+EBUILD teamviewer-15.5.3.ebuild 4086 BLAKE2B c3093c33cc700ee4e58cc2e99a133b6fc7234254db8f890ef5a0593910f189a0e3286d8cf7bc4feb0a5335f24960568dd6520bd9959b97fc3fe57420e6743bf6 SHA512 c25d94347c9eee586f117b2a90bf858972d79b9a60e0e9317ad59b2f711e817703ca7f27af4e8e05543188c3dc60fd5c414986612e095581bf8bf7536c720126
 MISC metadata.xml 249 BLAKE2B 11f9a85069860d951af16d4536b4dcb5808a383e12932121c0344d7df116522d143eb5e5ccb10ab69c7d6a27ee4d421f4a34557eb02b8b9926d7ef34f3efef10 SHA512 876b15663b8f716c63393d90ad0c78d96088f53a2b2add76b0b749bf69e75be84ef58184f148c70ec2669b773f4dd2e37d045fe72429a6ddd2086b691a553047
diff --git a/net-misc/teamviewer/teamviewer-15.5.3.ebuild b/net-misc/teamviewer/teamviewer-15.5.3.ebuild
index 3441acea1e60..d4da70a87a17 100644
--- a/net-misc/teamviewer/teamviewer-15.5.3.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.5.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
+inherit desktop xdg-utils systemd
 
 DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
 HOMEPAGE="https://www.teamviewer.com"
@@ -109,7 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 
 	elog "Please note that parallel installation of multiple versions of"
 	elog "TeamViewer is currently not supported at runtime. Bug #621818"
@@ -132,5 +132,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index beec1755b28d..fc1f4e45d97a 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -7,6 +7,6 @@ AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.11.0-r1.ebuild 4116 BLAKE2B 2bffb5d75fc40116bde3bed8da4b0f15ef8034da0d3855a3e2bd95494af4cb3bfb0f1b9817649af1da324930f63afebd6c7779abe08f4ad81d56285690efdbaf SHA512 76c338ad5aedae6741f61127de2cff7f42474e4edee196f3add68b31178120fd73f7510ea0d33e776dbe4f82f5f3282cc3ffbf6d15b431e89728f8ad2baa914e
+EBUILD tigervnc-1.11.0-r2.ebuild 4180 BLAKE2B 51b7ddb2c27200ccffe618f70c54dc6947b28948e5688450bd6ead4d1b0e822fb6adc4c4a400571f58f288c76080b1e210e6d88ba6573238debd7e1e85313166 SHA512 84e8878f281c23162689290ab4af514df1bb34898cdf770321fa33e83e5fbfe8390fd37ac7b47a390af3ca8327203a7b8cce218a7d5f7b5a8284f7b6c1ec36de
 EBUILD tigervnc-1.9.0-r1.ebuild 4540 BLAKE2B ff8f3c71c7bfc522a5f4ba7f028cebb9a6e01195f4dea198093171a0a860bdee4b0a34ac12513a75a78ad1b6936cad29b240e9491492c1bbc14ff7af6171f47f SHA512 709afdfba6be2772b1f99e1d2bea28e572bc99605864b6e4897595d47b0144a5290dbf78cfdf27ec49bff19170f82f0810bee3269c7fe57cfba9a4a3312b0d24
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
index c156213e877b..23c4836bddc6 100644
--- a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eutils flag-o-matic java-pkg-opt-2 systemd xdg
+
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
 
 XSERVER_VERSION="1.20.0"
 
@@ -159,9 +160,9 @@ src_install() {
 	if use server; then
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
 		if ! use xorgmodule; then
-			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
 		else
-			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 		fi
 
 		newconfd "${FILESDIR}"/${PN}.confd ${PN}
@@ -170,10 +171,11 @@ src_install() {
 		systemd_douserunit unix/vncserver/vncserver@.service
 	else
 		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
+		for f in x0vncserver vncconfig; do
+			rm "${ED}"/usr/bin/${f} || die
+			rm "${ED}"/usr/share/man/man1/${f}.1 || die
 		done
+		rm -r "${ED}"/usr/{sbin,libexec} || die
+		rm -r "${ED}"/usr/share/man/man8 || die
 	fi
 }
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 8e565a3c75c7..be083cf7b175 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,11 +1,9 @@
+AUX unison-2.48.15_p4-ocaml-4.08.patch 1942 BLAKE2B 18cd8c18e0c30156fd3e36aaa987a9ad033ff321edd4f911006bfec958d70884f3575536cfe543e8da0fc10448193bb3514936bab95f3c71c96b75b4f4048c0e SHA512 802b333418513df59fbbf956620f1576141763a898d320a3be06d35d5ad8adf38c13e9bc9dd38cae05f2d7a25c07a3fcc709ace66c6a92d728c25a42688494e9
 AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394
+DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec SHA512 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
-DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
-DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
-DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
-DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
-EBUILD unison-2.48.4-r1.ebuild 2446 BLAKE2B 623ed9dac7a80c7ac9a7419f390f7248532b794d5a3f1e90cbaeafbd90ee98021654a9e690872ebd42bbd2822092ed594c6e50552f5560a542802c8852270b79 SHA512 ca69c3c15068aba7c52aa0822b8b88ee219fec46e2f23ea6bb6c0892c169ea7b099206b2181b30688e441460251a35d11d9e976468d2ac243bba690552d81c96
-EBUILD unison-2.48.4.ebuild 2351 BLAKE2B f9629d54a0a1c47dd448aeee7cd1bbda01253fa422fe37cda0cb4f5f9d1e2906d9cfaf24e23a4ee3222389918beb4059a4d086a47d781bae42fd71ccc50f18ac SHA512 988fc794d474ae672e46580e8f9dcf73a068e79f989baa09fabca37ab35a3279cbd29540925de952bc67bfdacfb0512dcf1d0fc2e1a03c975fb4f6232a938261
-EBUILD unison-2.51.2.ebuild 2161 BLAKE2B 74f35bf07cfa486f07742e421ed117a80735e172de8d601e1a9dd2b8998eb9bb1a9cad0299d622b27d7494d0a0bd5e90587f1eecd3b02bd0fcf6069375581078 SHA512 9b51aadb8cf2bc12ef6933fa22d483d18dd2ef3af934d8a41de1ab8a4fd0254824d1dd2b3fa9b5bdd6b317a356784ccba12095ce7f6cffba72c72616785d0e6d
+DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
+EBUILD unison-2.48.15_p4-r2.ebuild 3009 BLAKE2B c6d6f34bb42d24e4045040a02cf4e5f83e4fe803b1d68b539dce3b723d0ee7d45d14543657e9ded729eafda23bb02bfa347645d35384c511aa55ff8c2d1f0f8c SHA512 5debbdb871a92943168ee1d204518f69a0902be6d2f8f918533b492b8b3cd0e84e6409a7e6a7159e8b2843a10e2e1104ad3c38aa099fd7f2fefdcf39856b7307
+EBUILD unison-2.51.3_p20201024.ebuild 2786 BLAKE2B 9cda5f7c4a19868d445e3a7aba95b31fb41f7ed8605d81a12364503dd2250173a7814bafe01107d82fd2330078e52bafeb91d7d8e64897e2ae69c9615f19517d SHA512 ad00ac0fa08372a2b203c63514b8109e4f91c4c8b41ccf9f60cd8862a91f51e3d978228897b433ee5a1775d775d427e4c417d93747dc1fa4ff000de86303a7f8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
new file mode 100644
index 000000000000..8a8205d3cfe3
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch
@@ -0,0 +1,67 @@
+Reworked for v2.48.15v4 ( https://github.com/bcpierce00/unison/commit/29fa058 )
+
+From: Stephane Glondu <steph@glondu.net>
+Date: Mon, 25 Nov 2019 10:52:48 +0100
+Subject: Fix compilation with OCaml 4.08.1
+
+---
+ files.ml                 | 2 +-
+ recon.ml                 | 4 ++--
+ system/system_generic.ml | 2 +-
+ uigtk2.ml                | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..7549907 100644
+--- a/files.ml
++++ b/files.ml
+@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+     dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort String.compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
+diff --git a/recon.ml b/recon.ml
+index 5ed358d..a8719c4 100644
+--- a/recon.ml
++++ b/recon.ml
+@@ -651,8 +651,8 @@ let rec reconcile
+ 
+ (* Sorts the paths so that they will be displayed in order                   *)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++  List.sort
++    Path.compare
+     pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+diff --git a/system/system_generic.ml b/system/system_generic.ml
+index 9230cdc..ee457c5 100755
+--- a/system/system_generic.ml
++++ b/system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link s d = Unix.link s d
+ let openfile = Unix.openfile
+ let opendir f =
+   let h = Unix.opendir f in
+diff --git a/uigtk2.ml b/uigtk2.ml
+index 206d8ad..b2a17e2 100644
+--- a/uigtk2.ml
++++ b/uigtk2.ml
+@@ -94,7 +94,7 @@ let icon =
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
++    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+   p
+
+ let leftPtrWatch =
diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
index b76c12b42399..2b4efbfb62ce 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -3,17 +3,22 @@
 
 EAPI=7
 
-IUSE="gtk doc static debug threads +ocamlopt test"
+inherit desktop xdg-utils
 
+# Use the docs for the last 'normal' release
+DOC_P="${PN}-2.48.4"
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV/_p/v}.tar.gz -> ${P/_p/v}.tar.gz"
+# No manual.pdf or manual.html available for this version
+SRC_URI+=" doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.pdf
+		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.html )
+"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
@@ -22,29 +27,29 @@ KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~spar
 RESTRICT="test !ocamlopt? ( strip )"
 
 # ocaml version so we are sure it has ocamlopt use flag
-DEPEND="dev-lang/ocaml[ocamlopt?]
-	gtk? ( dev-ml/lablgtk )"
+DEPEND="<dev-lang/ocaml-4.10.0:=[ocamlopt?]
+	gtk? ( dev-ml/lablgtk:2= )"
 
-RDEPEND="gtk? ( dev-ml/lablgtk
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-S="${WORKDIR}"/src
-PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch )
+S="${WORKDIR}"/${P/_p/v}/src
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
+	"${FILESDIR}"/${PN}-2.48.15_p4-ocaml-4.08.patch # https://bugs.gentoo.org/709646
+)
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_compile() {
-	local myconf
+	local myconf="all"
 
 	if use threads; then
 		myconf="$myconf THREADS=true"
 	fi
 
-	if use static; then
-		myconf="$myconf STATIC=true"
-	fi
-
 	if use debug; then
 		myconf="$myconf DEBUGGING=true"
 	fi
@@ -72,10 +77,17 @@ src_install() {
 	for binname in unison unison-fsmonitor; do
 		newbin ${binname} ${binname}-${SLOT}
 	done
+
+	if use gtk; then
+		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+		make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" "${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg"
+	fi
+
 	if use doc; then
-		DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
-		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+		DOCS+=( "${DISTDIR}/${DOC_P}-manual.pdf" )
+		HTML_DOCS=( "${DISTDIR}/${DOC_P}-manual.html" )
 	fi
+
 	einstalldocs
 }
 
@@ -83,5 +95,15 @@ pkg_postinst() {
 	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
 	elog "in your profile files to access exactly this version over ssh."
 	elog "Or you can use 'eselect unison' to set the version."
-	eselect unison update
+	eselect unison update || die
+
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
 }
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
deleted file mode 100644
index 56ef942628c9..000000000000
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt test"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND="dev-lang/ocaml[ocamlopt?]
-	gtk? ( dev-ml/lablgtk )
-	test? ( || ( dev-util/ctags >=app-editors/emacs-23.1:* ) )"
-
-RDEPEND="gtk? ( dev-ml/lablgtk
-	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-	!net-misc/unison:0
-	app-eselect/eselect-unison"
-
-#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
-
-RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
-S="${WORKDIR}"/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
-	default
-}
-
-src_compile() {
-	local myconf
-
-	if use threads; then
-		myconf="$myconf THREADS=true"
-	fi
-
-	if use static; then
-		myconf="$myconf STATIC=true"
-	fi
-
-	if use debug; then
-		myconf="$myconf DEBUGGING=true"
-	fi
-
-	if use gtk; then
-		myconf="$myconf UISTYLE=gtk2"
-	else
-		myconf="$myconf UISTYLE=text"
-	fi
-
-	use ocamlopt || myconf="$myconf NATIVE=false"
-
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
-	emake selftest CFLAGS=""
-}
-
-src_install() {
-	# install manually, since it's just too much
-	# work to force the Makefile to do the right thing.
-	newbin unison unison-${SLOT}
-	dobin unison-fsmonitor
-	dodoc BUGS.txt CONTRIB INSTALL NEWS \
-		  README ROADMAP.txt TODO.txt
-
-	if use doc; then
-		dohtml "${DISTDIR}/${P}-manual.html"
-		dodoc "${DISTDIR}/${P}-manual.pdf"
-	fi
-}
-
-pkg_postinst() {
-	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
-	elog "in your profile files to access exactly this version over ssh."
-	elog "Or you can use 'eselect unison' to set the version."
-	eselect unison update
-}
diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index 3c6d4df6c2e3..f0744e723563 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -3,43 +3,53 @@
 
 EAPI=7
 
+inherit desktop xdg-utils
+
+MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27"
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-	doc? (
-		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html
-	)"
+SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE="gtk doc static debug threads +ocamlopt test"
+IUSE="debug doc gtk +ocamlopt threads"
+RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 
 # ocaml version so we are sure it has ocamlopt use flag
-DEPEND="dev-lang/ocaml[ocamlopt?]
-	gtk? ( dev-ml/lablgtk )"
-
-RDEPEND="gtk? ( dev-ml/lablgtk
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+	doc? ( app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex )"
+DEPEND="gtk? ( dev-ml/lablgtk:2= )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
-S="${WORKDIR}"/src
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
+src_prepare() {
+	# https://github.com/bcpierce00/unison/issues/416
+	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+	# https://github.com/bcpierce00/unison/pull/415
+	sed -e "/myName/d" -i doc/docs.ml || die
+	default
+}
+
 src_compile() {
-	local myconf
+	# build unison-manual.pdf but not .html
+	if use doc; then
+		local myconf="all docs HEVEA=false"
+	else
+		local myconf="all"
+	fi
 
 	if use threads; then
 		myconf="$myconf THREADS=true"
 	fi
 
-	if use static; then
-		myconf="$myconf STATIC=true"
-	fi
-
 	if use debug; then
 		myconf="$myconf DEBUGGING=true"
 	fi
@@ -53,24 +63,33 @@ src_compile() {
 	use ocamlopt || myconf="$myconf NATIVE=false"
 
 	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS="" buildexecutable
+	emake $myconf CFLAGS=""
 }
 
 src_test() {
-	emake selftest CFLAGS=""
+	emake test CFLAGS=""
 }
 
 src_install() {
 	# install manually, since it's just too much
 	# work to force the Makefile to do the right thing.
 	local binname
+	cd src || die
 	for binname in unison unison-fsmonitor; do
 		newbin ${binname} ${binname}-${SLOT}
 	done
+
+	if use gtk; then
+		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+		make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}"
+	fi
+
+	# Waiting for https://github.com/bcpierce00/unison/issues/411
 	if use doc; then
-		DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
-		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+		DOCS+=( ../doc/unison-manual.pdf )
+	#	HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
 	fi
+
 	einstalldocs
 }
 
@@ -78,5 +97,15 @@ pkg_postinst() {
 	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
 	elog "in your profile files to access exactly this version over ssh."
 	elog "Or you can use 'eselect unison' to set the version."
-	eselect unison update
+	eselect unison update || die
+
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
 }
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index d0eb075c1f5a..2b4435984776 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -5,7 +5,7 @@ AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
-EBUILD vde-2.3.2-r6.ebuild 1492 BLAKE2B f5f82e24bdbffd3eac3066c2a26657a3f29041e634f9b0132c7d2ee9323536be5e75912716b137f1bdb3dd30bd9a86a32e86089188aacb30e41eea746887c22b SHA512 6b5abf52deb147499c294e58c2f363df0313eaa9a7cb1af97369a5ea557c706a8ed3199bcb3405770918c97765417485f140d3e28292b7f8e6b62c8bef502400
+EBUILD vde-2.3.2-r6.ebuild 1491 BLAKE2B 25089bade969f2bcde7f4c16e85cf049d84b21a21ee073bac1fcfcd504889c82cb15dcc17c4ecad53016733231d7a47cc501e3b5a57985d4bcda6798d9ee603f SHA512 66e5797b6da812bcf167f528fe2cb3a5291a86973f1571c5e1a0274327f29eadc0baa4b3086081e071555f9213c15a127043964c20c2bec07e5e72f835157a19
 EBUILD vde-2.3.2_p20191011.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
 EBUILD vde-9999.ebuild 2190 BLAKE2B e0484281c05d992c02fb27c908a05eddd0b4a62a6cacb7331add7ea5c53702cd3e0006e1c5db17db5df7a54051b5198ad12953f3b1922f44d4acd8387073b34d SHA512 5068cbddcd630a5c87bc021cde9e4fe2a102d997c4bdb7e131ce1d6e8602cf13511e887d45520ace6e1fe74e6e80b327426fb1edc9a04384b5019f5983cbecee
 MISC metadata.xml 955 BLAKE2B 6e199d64f0af38e233d31f2f91e364f7f01910b9a450d215abc6ad4b5aad0a8d639d7dabea4d76cdf4d8730b4969a0466aa07496cb858ca9581c3c20bd837191 SHA512 06ac79d51fd38f77e4f3840995d228c61923d512e023ab74915030d9ee4ec628669c52d99fb040021ed1452fc5e4ba459a7a29e08fb898b44bd99642e1d7a6d6
diff --git a/net-misc/vde/vde-2.3.2-r6.ebuild b/net-misc/vde/vde-2.3.2-r6.ebuild
index dd3ab5980fea..e260adf4ed86 100644
--- a/net-misc/vde/vde-2.3.2-r6.ebuild
+++ b/net-misc/vde/vde-2.3.2-r6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://virtualsquare.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 IUSE="pcap selinux ssl libressl static-libs"
 
 COMMON_DEPS="pcap? ( net-libs/libpcap )
diff --git a/net-misc/whatmask/Manifest b/net-misc/whatmask/Manifest
index 42ffd0c5fec0..a26705e38e4f 100644
--- a/net-misc/whatmask/Manifest
+++ b/net-misc/whatmask/Manifest
@@ -1,3 +1,3 @@
 DIST whatmask-1.2.tar.gz 170183 BLAKE2B f334b6ca11334445b381ff89c15a7b2b723954fdd9f2fb0b6ca875f57316ec2990ec1dccdc7ab78cb285be7889b035899c118976761a098f0da8f2709b1c04af SHA512 7e32eedf4a58d7f0396099ed07d6d8fed14dd12fa166316bfe8d3246643c50158c19a192272f555e9fbbb99f009552ba294c9e27b6dbb373f28067ce9ff5cd17
 EBUILD whatmask-1.2-r1.ebuild 499 BLAKE2B 4beecb80ce74d485f48adf9fcec1aebf157244f807fbb73d836ce52ecf20cbaa34e1a5cd523492b06a2ebf248fbd59acb72277aa723d4fa6ce564e9a8e0546b9 SHA512 e8d5b67b27bc6dd6e1cd23ac2d65fa2d455c4ebf18a08ce2893fcfe8310622963ab61f89c68ff20b15f805b25e3cdcd15c2263d18160019c3434ab2a3b2a183d
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/whatmask/metadata.xml b/net-misc/whatmask/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/net-misc/whatmask/metadata.xml
+++ b/net-misc/whatmask/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 438a8e2a7b97..4248d1977901 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -2,6 +2,8 @@ AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 AUX whois-5.5.6-libxcrypt_automagic.patch 677 BLAKE2B e832e829f97c9b23ca4d62e037f74fdf87225390a399fa240f0789123144f07f3e2d66ec009662c9936d1a0f112998532350a2144d95dc96cac7b22250090fac SHA512 14b2787fc7933eaf21584dc93b84a605a3f593b77767f2b622b906f03c75edd3faee3d39281dc4332bb5b64b24bee07c7ccd1115f2e80ae394637bf093f70305
 DIST whois-5.5.6.tar.gz 103581 BLAKE2B 7e4aebeb440b95a278a0f0d0e51dbec2003599ee9f6e6355f29a5b043ba5cbad19310058964120142d417e6a5df86bd68d03d7ac4358be488538584c2a56740f SHA512 97a139a8e24b9a92c5597bc31e1b8d5d5bcab1ec4cc53f80cbdb7f2e5b7e54f36b3a8a8d90fd7b86452aad36adc0ba2015aaf936643b290c8a777f5f6cb27ef3
+DIST whois-5.5.7.tar.gz 102666 BLAKE2B 33ead2ffdeef4ccb838eb0401cbd774837b58cbf0e9d0e079a89b1e0d29ec2303022d442c5e5bbe5c7f16099b0e1525e0d1144f0f7a6f362545d89e4990c3f8d SHA512 a0b3f1ce46dfaa165c765b8d39d33d026842c74d26aec35bbe9d6b9e12364b37065f5799913f32da04f1896c9b69a6932ad70975c91e0b51ac9d4d30679e1c2c
 EBUILD whois-5.5.6-r1.ebuild 1927 BLAKE2B 9d7b89f81502de253111365405f2297e63896fca0ade76222d8aaae3f05cd91b88cde8129c9d98ecf167ef380601f6197a00cc549597e29e968211d6f86f4103 SHA512 5f539dff3bfdbe7e75184bc04420d70e376118394a9d3f286f04cb36462b7eb0d8eb735b36ba5a08c07cd7cb1caed86ee0719c3cbe8b85bebd7edb3b9c9a6b4b
+EBUILD whois-5.5.7.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 EBUILD whois-9999.ebuild 1913 BLAKE2B 1b7be0cc8b1d074cbe507e9dee7c0d1deba0e1b4389980a2c29026d37b51abd21dd1b52213f381eeccca69787580e8a4b72fc572ab2fbdc51ed91fcd185ad217 SHA512 1f365041a0b643011257e9edeb0f036f045fdfbd1018c2eb8ecea6e7839839e55817fad892c213c7d7364776dd8dbe33152fa16587bd7b94300ca8cdb3ce0828
 MISC metadata.xml 438 BLAKE2B 3c2de7b15d6973ef59d174c857597c7f320176305e7f37df85694b87874f9590f37b75402b9ce273c20855a67c54e47f64cc5c0f0cd77a5baeb348bab5c44356 SHA512 cbe1e74802cc8810ebe72d9daf7a3863bec49f70c0ac17c09c5616cb3dd5074ecf1e53172b522f30197f7e994ae7596f830dbf4c791c86083727d8b452db309e
diff --git a/net-misc/whois/whois-5.5.7.ebuild b/net-misc/whois/whois-5.5.7.ebuild
new file mode 100644
index 000000000000..8aecce2f7642
--- /dev/null
+++ b/net-misc/whois/whois-5.5.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls xcrypt"
+RESTRICT="test" #59327
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )
+	xcrypt? ( >=sys-libs/libxcrypt-4.1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+	"${FILESDIR}"/${PN}-5.5.6-libxcrypt_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	use xcrypt && export HAVE_XCRYPT=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index e0cc3b913841..763401aaab11 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,4 @@
 AUX wol-0.7.1-musl.patch 347 BLAKE2B 4ebedc009fb77556004f8bdda8679ca2f0eaca22145aa395a69ce6e78319a6c3fb430bc4ea30c4887dd4e870ad1ff36d7369ec3dc50a419bc5e8ebcdd29ebd7e SHA512 b7568aa53f20a0402aeb9ed579fab2846245df134c000cc4483ce63f01ec64943708595fff9f78c73e6c6156ddd06781314dee46a06c216c9abcd0f1ec696208
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r2.ebuild 580 BLAKE2B d1f96ecb22d0ae3e8ed3baca024dcfd1ddd529c5e0e15abbffa11de33c45e9b2c7bed2540e91e9ee39f3a89bccb70434a64dc114f3b90eaada9e9bb492351499 SHA512 859fb5df28af1a8c11e23f3eff2f07d9e6c74ac78e15f3709cdfc9db8ca146e8c07351b55e02214104706c7bf83356dfa9d941b821dc851b49b6ae878ab7c78c
+EBUILD wol-0.7.1-r2.ebuild 587 BLAKE2B 1b6e054225eacfba846c97bce54abf85269e9e8af7196e2441c7e48d49a0b661ad1feab4517edd724e726bfde26730985c77d126fb02b886f022b99790c4734f SHA512 38af73d55c8f9b0af0350a9be2f42d3315ff75b7368cff35adee0a53189f86747cf041ac3cdf3b2d7c6279449688083525dbc95d2b7ce1471cdab5554747b2d5
 MISC metadata.xml 616 BLAKE2B 5beea9884b74086c02e1cf37e08157dee574c98c56f06371e96132a31747be644761601429ff79211eec98004dd468b5e51e7a71c480b0d6e3e43d3e5941dfa3 SHA512 ba5865dcd92e68b01a21d126aadb530d936639bb391b959c683e83daefcc671201b772a713fc0a6397eb892558c8e9691700ee97955b3992fd64ecf1cdc9c240
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index 67f55caf695e..9bced4b712bb 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="nls"
 
 PATCHES=( "${FILESDIR}/${P}-musl.patch" )
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 9bd2302729f1..97033860d4cb 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,9 +1,10 @@
-AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e4630d901e573ef87f8b99d55e08c063c8ff0e497fae3cc75ccb72acddfd1787f19dfef12672a5447b364ceb6 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a
-AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146
-AUX wput-0.6.2-respect-destdir.patch 763 BLAKE2B 2f933c1c8f30df659726997d6380ec8e18c4abc987804b8f492a35399ff65bbc9a13e28d9263218776a0e68319adf6980db23d27f161a9a68a431760ea7b73c8 SHA512 868412a0ed44476960c723bff0167ee411fbc6161c9e0254eadcf2dc4cf3fe5efedf2a9d1fccd7381b384d73d977f297cfa37715ecdf377d98d0fe0a3f6d7129
-AUX wput-fix-crash.patch 2183 BLAKE2B 5d27232a74f895567ede151843df61d21f43913689b27f380c71cbd0dfd619fc081f6d01d24ab34b2cc183c9f5d60f6c419307efc4875a00bcf8b95b4b5e73f6 SHA512 bd8d2ac244486968a977257f32d47cb18b158756bf73aebb19a69c4e4f3c60fbe58b8bfb2118edaf7ec28e42b5e0b270c383cb3014d4f48b8e766d73c24fac50
+AUX wput-0.6-gentoo.diff 519 BLAKE2B 0a157c48c2f9764dc91c64783ec0c00e4a73bafccda6dc52be7f0784cd08386991452429202088521527d56a7fd808eca11936f1caae2d5a2ea88f237f2d28f8 SHA512 74a6902283f405649eb358781b8f9373b02ad2825fe5a425233b3e7a3a270bdaa4ac8f8ac76c4ace03c760505aa9eaa089b98706bc669bb9a536dedd5f0c94d7
+AUX wput-0.6-respectldflags.patch 290 BLAKE2B e2880dc839b0eb2052f6f71e32bcb7f37e7ea57b162b661e0a0da216f35cc878f564d05bac1e209a9e0d0851d81f53781002a6237ae8ca2fcf133edd5d79d017 SHA512 48d7f547b5d386f0d80cc3dd96293f112144416b3c59f69ce7827c6f96b303a26cbcd17094b8988ed816113a70e3181846c415de6939034ed5c5c69baab91113
+AUX wput-0.6.2-fno-common.patch 559 BLAKE2B 47937469ca44f74bdbfede40b43fe2900153747ba3fc3735e70b4f6949cb80adb4cb878a7cd9c046d19e05f68921f125b8dd1fdc41459227b5fdd30062e92536 SHA512 4c48dd943e9551d54a70b5c0e289f85af5f4b1518c238a2184e75e62f2fcc1869f681edc48dc40a1249acf98c228c7e79595bc70930b22c1720d82b3e39dc123
+AUX wput-0.6.2-respect-destdir.patch 694 BLAKE2B 4c4466c56b8ecd1e36036c3d33901b76dfe53f918f40f7b3bb34f5e58dc02b701ea7a1969b71d2fdf788b9478d4c5fcaecc7136848fcf2f9e06da09761e58b88 SHA512 a92ef8c35a94b4ff624cb9f1b548cba656151ae88708ed6da889c297e6d09cf161282de9f5324f41ac3d02f2aa0817e86b663637577ff519d780d587cb214c15
+AUX wput-fix-crash.patch 1974 BLAKE2B 229d5afe628682831d28ce1ccad0856883061749d863073dbcf58bd0a0cc435d84434d26068309154154e3c15922a0432ecc3fe01127d18767aea5b8d01a83b2 SHA512 2fa1e6793b9cda2695255196f30a5e615a013883efa5b10983c5bd38debf616bfb36ad2e61675700b32f32c0b4057ef7ec0c33c502fc3ead37e1547ecd944783
 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
 DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
-EBUILD wput-0.6.1-r1.ebuild 771 BLAKE2B 11233a6e15d359f028f1abe461ad17b63236daf5eede7311e0fe86989941153033334575be4c41a8470f931161e1de535be12446ebccaf47037a6684e11e9ea8 SHA512 284e8945df93ba93a2322f1f62254b4fa671a1bd6045cecbe52bfcb54918b12f27cde9d710f896ea39839cafa1dfe617597fe6674717d8c297cf512dc43e9702
-EBUILD wput-0.6.2.ebuild 792 BLAKE2B a50545adf471673b1685a7c806fa8b23017b6a2d01d54f5e9c8f2991c3ef59c978b7c9cded040e58e0faf9239f021eaf66b183974d881004fae5cebd2d7943c1 SHA512 973f29353ff28d8131a8121f73749b3265e4cbe47e40862eb7dfebded29e8c25d29892390ea1e5ff98816f674c47cb23c31da6b2f9616bd9d24d8b6c92a2e4e1
+EBUILD wput-0.6.1-r1.ebuild 792 BLAKE2B c24a667aa36e9651d537a4e1b4650f71293401c637d9c0c14e4bb87fb99172f5cebde554bf99fa28eab233a903d1374cd1cfbcc3323dcf454833bdc8d8d11ee8 SHA512 332d9d377d7154bc9209e709c52a805759b2d0b22182696b539ad3b9fbb01c46874ba5b1a6afce96cba5fab921ff39f13bed841adef0c0893db9945291a5da03
+EBUILD wput-0.6.2.ebuild 839 BLAKE2B 117175f94dbde239cfaa0917a02194437e147f5b623204b124bd5e58b51b8dd02539aeb23e4b54bd38e9e3abf6157077bec49b8f477ec13ed7aa943966effcd2 SHA512 b230a872dd44ffc0da8af27fbbfacfe5a946bba1ae60c9acbeaec2f5d6a31233c08d6cf807114da3fe6cd12359615baa703b04f60e5eb389c5385193a02a9514
 MISC metadata.xml 239 BLAKE2B a1e387e39d693cc8b109174934b235238904f96fb78916bc73bd86e4b442443cc3b225409745025fb826de6086eb6356429527338c3aa1b42e92f1d886d7a094 SHA512 8326a50cb35d854df982951d3632c3b36672f9ba75f9644da70a4814a27ffda0c7c435e733c5be15210e2d2eb39ca781500ce55c1d409a1e81844fcecd859a10
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
index 312172348d02..7ddf0ba3ba19 100644
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff
@@ -1,6 +1,5 @@
-diff -urN wput/Makefile.in wput/Makefile.in
---- wput/Makefile.in	2006-04-04 18:16:52.000000000 +0100
-+++ wput/Makefile.in	2006-11-07 17:31:10.000000000 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -15,8 +15,12 @@
  
  install: all
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
index d2b460b339b3..9f0e09c4a78d 100644
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ b/net-misc/wput/files/wput-0.6-respectldflags.patch
@@ -1,6 +1,4 @@
-Index: wput/src/Makefile.in
-===================================================================
---- wput.orig/src/Makefile.in
+--- wput/src/Makefile.in
 +++ wput/src/Makefile.in
 @@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
  ftp-ls.o: ftp.h wget.h url.h
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
new file mode 100644
index 000000000000..f188141aa87b
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6.2-fno-common.patch
@@ -0,0 +1,25 @@
+https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
+https://bugs.gentoo.org/706954
+--- a/src/wput.h
++++ b/src/wput.h
+@@ -140,7 +140,9 @@
+ 
+   unsigned short int retry_interval;
+   unsigned       int speed_limit;
+-} opt;
++};
++
++extern struct global_options opt;
+ 
+ extern _fsession * fsession_queue_entry_point;
+ extern char * email_address;
+--- a/src/wput.c
++++ b/src/wput.c
+@@ -55,6 +55,7 @@
+ #include "utils.h"
+ 
+ extern char *optarg;
++struct global_options opt;
+ 
+ #ifdef WIN32
+ const static char * version = "0.6.2-w32";
diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
index f0cbfcdebd69..9cece1f388f8 100644
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6756cd2..6debea8 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -16,12 +16,12 @@ win-clean:
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch
index 2afab8e59913..3d0efc9fd37f 100644
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ b/net-misc/wput/files/wput-fix-crash.patch
@@ -1,6 +1,5 @@
-diff -ur wput-0.6.2+git20130413.orig/src/progress.c wput-0.6.2+git20130413/src/progress.c
---- wput-0.6.2+git20130413.orig/src/progress.c	2013-07-15 00:05:50.000000000 +0200
-+++ wput-0.6.2+git20130413/src/progress.c	2016-10-25 16:48:05.909105000 +0200
+--- a/src/progress.c
++++ b/src/progress.c
 @@ -181,7 +181,7 @@
    static char output[15];
    time_t secs = time (NULL);
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
index 4622df777968..4121f54eca36 100644
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
+DESCRIPTION="Tiny program like wget to upload files/whole directories via FTP"
 HOMEPAGE="http://wput.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
@@ -12,15 +12,14 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug nls ssl"
 
+BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="ssl? ( net-libs/gnutls )"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6-gentoo.diff"
 	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
+	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
 )
 
 DOCS=( ChangeLog INSTALL TODO )
@@ -33,7 +32,3 @@ src_configure() {
 		$(use_with ssl) \
 		"${myconf}"
 }
-
-src_install() {
-	default
-}
diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild
index c95956b3e7b1..b9fa842bf3ab 100644
--- a/net-misc/wput/wput-0.6.2.ebuild
+++ b/net-misc/wput/wput-0.6.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
 HOMEPAGE="http://wput.sourceforge.net/"
@@ -9,19 +9,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug nls ssl"
 
+BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND="ssl? ( net-libs/gnutls )"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6.2-respect-destdir.patch"
 	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
 	"${FILESDIR}/${PN}-fix-crash.patch"
+	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
 )
 
 DOCS=( ChangeLog INSTALL TODO )
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index 99e9a2a509f7..54e69a64a636 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.gh.tar.gz 29740 BLAKE2B bf0aadcd4c85351c9deb4908eaeef80536d4ee123b194deef6959ff85f05005666de71c71112cc9c0083a0c5f996cb173a957c52bacade3b23ef0908d341882d SHA512 293c0bc623400d3359a920eca491930daa110685936cfcaf9eea07e439fc29de64413f4df4a18523cd8fdfce44794c55d7e3abafb904e8e90891b22d38f01a2f
-EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 950 BLAKE2B cb481e5eeedb393402b14e57664f28e004d2ee9c7e5ff7b9dd53f40468074c934693da1f2b5d10364283c577f61d5e09b325008e4f594816ac3e8317e3a9750a SHA512 6bf96f0fecc73acb08621501e0acd80a25a88ca99e2c1bbaaccd50a9145bffc1c8a6bbfdb1fdb4672e9e61ca789ab74869cb85ffc5b4aec57ac084db8e7b0380
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 955 BLAKE2B 80889dcc1f3b093adbf72be1943842d9fddfdffeb4c123004b164bd836c78ff6c2f86841bffd76c024b710cf76b90f734fb3f0b7eac9411d10b4989223af94d7 SHA512 126380abdb294d624ae126f8b94efff33a34f462f09adf6c5d53aed53679441e791ff689e2d3f0d51bdfc1c43fe2cbce29ef792c90c63c8116ef38f4fee63f2a
 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 9ad47b423528..65c9a6691948 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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sigmavirus24/${PN}/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/ssh
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 795277c1829f..a6bbe2bf6872 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,15 @@
 DIST youtube-dl-2020.09.20.tar.gz 3188480 BLAKE2B c12ee589d112155207b59da9f710b2c776c07464d5c64a5d8355b963a81765b0dbc65df4f9564504fb963f30d5a11dc7e662c14d58ddf9fe6347352363cf70a5 SHA512 ed511016d0cfcbbee0cd651f793cb31cdb46d80243f86186de1cc54cb2a2055fae2f5cc3e16f838fc2ba47f3ff6f3b484219c8a707904fbc30193a2b28a1e30c
+DIST youtube-dl-2020.11.01.1.tar.gz 3190146 BLAKE2B 9f0a6d5041f12881d0f028459054e9cd6fbb91de35dc3d61782889f97611a39fe4a8e1c28fd45585d638ec179f6d9cd6587b06ee2d268a9f44f83f282961f367 SHA512 2c84305a71776808797a651e22690a396c1bd4c922ab6f15b086516b836aa6ac3acf5b08f556567b11f470c0d972adbf67fb110dc34ccfc5c0897e576e42ebab
+DIST youtube-dl-2020.11.12.tar.gz 3188015 BLAKE2B 17267ce8c3068f3a1aca20b23a77a964b005fe4a64a5c37fd3f1d97e4daae4978379ff81b6e4ac4b86fa1f3d27f01b1742dc26e42ea5b8522e3408bfe9f9e944 SHA512 7db373f6cc252635a3613ffe0b3b10640e262778105ebbd78b837fe019b0a2609032d2aeb81b239e000a86220aff99d2c018a9a6325adad6981a8ab64048131c
+DIST youtube-dl-2020.11.18.tar.gz 3186065 BLAKE2B 1c27ffc59bbf7793c58e554923ea7ef8a528191e896f64e39ecb181582bcd9bfecf6de5622e70c873528b1b0b3a8335a12ab6a7b3ac71d603391ebbf83110b89 SHA512 110de857759b4c4bd0160242adebb3d8690bda2203a28a7b1a2ac1cdd9bca058702fd0b323010629e74bbb2df38f50c67b710bc2a6ad4cc907827ee013d0dbcf
+DIST youtube-dl-2020.11.19.tar.gz 3188309 BLAKE2B 775700f26491257125eb68ce49c1ec062ae21568cb3f20463330430d225e2af4e02daed839e5c29cded9b92921a16f0a9611fedc748ca1cd6152c33a131d1503 SHA512 042b0fbe0f1100c338924c9278d4071aaf4cd27dfc7c9d951244aec91a9168358e7463352548a5b7c6a567b077a9db69776790c3a35e08bdf6552f465b4f735f
+DIST youtube-dl-2020.11.21.1.tar.gz 3193010 BLAKE2B a7c04f83815e5b7b6b75109863cf470ca2f756523c08fdfb65386756c9cbfea80e9ee2583f26cb41aa382f747b125543b86bf521a7c0973632a3ca331f48499c SHA512 8f9b77eabe7821f952b706fff4db7ef4e0627dc8333fdfb5cfd0d1dfe4f3bab9ca54525c8c9ed7c285d75fe08c02060dd05744a9a82a526789c67040f8cbcd09
+DIST youtube-dl-2020.11.24.tar.gz 3207954 BLAKE2B 9c1382b73018fc366b4dfbc077be4bdc673812b7073c4e2e79159ccdf5d05443f0b07def13187f1a01e6ed36fc57a29c69d6c1a11c3670bbad3774e8f7f54f4f SHA512 51e29b00fe69a53b957b2108940d9fbe374aadf835e4449b15e799be59858f5273934fccf930701c2eb1c867c65b3b921a55f98b83088f9f0e01541f6fa7a90c
 EBUILD youtube-dl-2020.09.20.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
-EBUILD youtube-dl-99999999.ebuild 2068 BLAKE2B 93977d0be35ac43d7ba1cea51a20364effe0c87a11684e02a13b70fd682d8199fff2652bd86767b3ea4a148603ee93ecd7837e7fcc54139de5ae59cdc510c1e6 SHA512 429c926a0fce1cc0ab8cabdae8904ab0fcd99399c7b6e924d7034ad07f6d038489f44ebb9ac0d69cc270a023c37d0a2845fa22deb8bd94a4d6d9237dd1114043
-MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
+EBUILD youtube-dl-2020.11.01.1.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+EBUILD youtube-dl-2020.11.12.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+EBUILD youtube-dl-2020.11.18.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+EBUILD youtube-dl-2020.11.19.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+EBUILD youtube-dl-2020.11.21.1.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+EBUILD youtube-dl-2020.11.24.ebuild 2110 BLAKE2B 1320f9951773c911bebdf447eee8330a16a7c309cdaa9f41fa11d84f7604d63eff0e615c9911f1b7b58976307f962a1d3065272f8eb007f9cf12ff336a4d8671 SHA512 76ce2c0e7472b7389a52a4af9441ad6c936ff74cb1f524c380960afdbc20ae2d7de8ca8d7b25fc2797e8393ec68abd011845eb2fc072472ad757ba737e94c770
+MISC metadata.xml 353 BLAKE2B 53a5a71088d6c6ba1785f245c36c8c7551eb800b308313a053cfb5f292df1adce321383522528a06742aabee8f5d7fe8d2d9805c28632fce1d50f6a938b163a0 SHA512 01570d01232abde7a0d3983e307197cd07ad010f57f5df49048405b45fe2e1f2aeb0594260014bd4d95a6f234885e29ac802111402df3707d41b4b0f75b7457b
diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
index 6a4728cab751..5a459dba5f89 100644
--- a/net-misc/youtube-dl/metadata.xml
+++ b/net-misc/youtube-dl/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jer@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.01.1.ebuild
index a2a765dd04cb..0839988f367d 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.01.1.ebuild
@@ -2,34 +2,31 @@
 # 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 git-r3 readme.gentoo-r1
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+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/"
-EGIT_REPO_URI="https://github.com/ytdl-org/youtube-dl/"
-LICENSE="public-domain"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
 
-KEYWORDS=""
+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}]
-	)
 "
 
-src_compile() {
-	distutils-r1_src_compile
+distutils_enable_tests nose
 
-	emake ${PN}.{bash-completion,fish,zsh}
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
 }
 
 python_test() {
@@ -37,7 +34,8 @@ python_test() {
 }
 
 python_install_all() {
-	dodoc README.md
+	dodoc README.txt
+	doman ${PN}.1
 
 	newbashcomp ${PN}.bash-completion ${PN}
 
diff --git a/net-misc/youtube-dl/youtube-dl-2020.11.12.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.12.ebuild
new file mode 100644
index 000000000000..0839988f367d
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.12.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+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"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+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.11.18.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.18.ebuild
new file mode 100644
index 000000000000..0839988f367d
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.18.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+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"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+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.11.19.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.19.ebuild
new file mode 100644
index 000000000000..0839988f367d
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.19.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+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"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+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.11.21.1.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild
new file mode 100644
index 000000000000..0839988f367d
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.21.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+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"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+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.11.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.11.24.ebuild
new file mode 100644
index 000000000000..0839988f367d
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.11.24.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+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"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+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/zsync/Manifest b/net-misc/zsync/Manifest
index d975f721fb07..8924ff3a1d0f 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -1,5 +1,5 @@
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
-EBUILD zsync-0.6.2-r1.ebuild 1095 BLAKE2B 6cc0476c3a5f2ff9f22ffc2d8680b037dd85a07ce6aede4b6b5623593bc31bb7b9b18fc7ca8d632bbac4ef9961051143a077ed8f91e33986013b932b7c382ffd SHA512 f03895cafd2fd1d6a18d56b12fcdd26edf847727d73511c4043e168208e8bc7b17d01ea74c2f22e0e6d98c853553b1d085a2c2c478d7688da635d24fae29dbb5
+EBUILD zsync-0.6.2-r1.ebuild 1093 BLAKE2B 6425939e085ccfcc592d97959ed189aca9f08c08a474b106b8af4f793977fc45274c2fbfb1ff0a1f41961a069cd26c169b6012e574055332da91a4f18c668d1c SHA512 ce58ab2a8b00c1fd8def2b0da99ab3cff1eb9147d058552e1adfcdb932ceb5bbe30d7ac482c619c0cf7e30d15877f5c05f60c9860d795bc7071d9910196aa812
 MISC metadata.xml 1248 BLAKE2B da1ebc159e8f07cf0237017bf86cda2dc162472539ea5b8777c0f9f12384e6728eabbf0dc0d87823c5480b6a905eb533042ef2ca9ec1b83a52f6cb9e4082bc58 SHA512 ee5763e3797b34d9b70bdada81f187c7d61cf155a0c207b6b70067a1407770dcdd2f7cce93f796fc022bed0577935d216e57f3260cf1a2a0a23672dbd610c04a
diff --git a/net-misc/zsync/zsync-0.6.2-r1.ebuild b/net-misc/zsync/zsync-0.6.2-r1.ebuild
index ca66b738bda6..45f3f2729a6e 100644
--- a/net-misc/zsync/zsync-0.6.2-r1.ebuild
+++ b/net-misc/zsync/zsync-0.6.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 ZLIB_S="${WORKDIR}/${ZLIB_P}"