Merge branch 'edge' into next

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-17 14:32:10 +0100
commit: 51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree: 753b6b08624c34d1ed8414bbe22c45409f7741b9 /net-misc
parent: be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent: deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)
185 files changed, 3109 insertions, 2705 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f35c92df836d..e42e8805925d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index 154b2bee3a0e..2b7121156d61 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -153,6 +153,6 @@ DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43a
 DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60
 EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
 EBUILD asterisk-core-sounds-1.4.22.ebuild 1853 BLAKE2B bbdd6efb432a829f6c3408d5b72fe51bc2758db0800a660d98c6cda8be15af82ce6ed4026ce1d73bdc8de442e225505bf2b598d378a4c7de7822b3c12ac9208a SHA512 b798ec930025c9c5ed86a0c911da5403c57c015f1fd92dbf53e2dcd6c79e951eac4d02692b874147537a518b4d3aade0aec634c635f506bbac75876390d95194
-EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1731 BLAKE2B b9a6be51edd9026f5645335742b2fe0034e9331b194d861a0db6731537311a652b57c0995b3eeeb444e5e3cfd9ec69c9c1b0f2737f7246dbb3283e62dafdc4b4 SHA512 df00909abb5494b546c45f4aa68adaddc8131fae40ae7a666c9385a6ebb2b0a16d0811fe20160f436b336b8ce276652f5516242306787aea9e5051c283b9a763
+EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1738 BLAKE2B e118f35620dab8809b0e1dfcde76319e0c058cb9f3bdce058faf3d10b5379258fc1ead1c50c971be7874648736f1512dc0c894977af54245a0efa1e79f4ba1ad SHA512 e7fc7b8684b25b3b15f580321deb0657254c0d2b11d80bb3187350e465c7950ae756275b608b858e3449590d20184c05f01cb355492f0c1218a2a67ca2f27a19
 EBUILD asterisk-core-sounds-1.6.1.ebuild 1918 BLAKE2B 3fc7d2338255e46b873a530b1faa0695f141dc973067e424a32ead733892c5cb5c52ffe3e8219e85343737c3302553f5ea8a0abc7e8b7d8bdcfebda257bfcbce SHA512 ceac6189c14a623eee56c1095f01c6f038eaa1820a741c2fb2843c92dc9991864b5d01faaa0060831af7e56a49b0acd2e1c5c345338d604c4f6d65cfd7d9d702
 MISC metadata.xml 958 BLAKE2B a0bb142f5343679cc734d2154054fae0a93faf3cba74dd6a0939d37b1acfd7dc0c41b1aa22bc7a45e408b7c046d31d9c29ad9d5f2869d7e6c5388c10bafb99f6 SHA512 0665a156659c7b7199f06cca2a2d9498ae1230f65e850b92b2d8efd56550671c6f1932beae53b27ddd145133dae067e0fc0dfcfd264ab251de17f2bda7e8d3bf
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
index 2b7e7e0a7500..ed79a6611dcc 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 S="${WORKDIR}"
 
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index cee545189035..694b6eb5219a 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -44,5 +44,5 @@ DIST asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz 11539559 BLAKE2B 919cacb90afe5a0
 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
 DIST asterisk-extra-sounds-fr-wav-1.5.2.tar.gz 22856532 BLAKE2B 921135610f7329893f0a90e88845507a26240948dde9fb4b83db4e9133d79fbd395336ceee2504e2438f868216901eb7bae79e2c63168255bc538e2892469102 SHA512 edbf1b36b2c2083f696f52021e7719d4ac6ced29c312de77465fb3ca7d9444e09cc91fe3c6fdb45140124c44418c571f2ce1145fcff5cf88765bd0d62770e3b8
 EBUILD asterisk-extra-sounds-1.4.11-r1.ebuild 1420 BLAKE2B a0c707d7bde726eebb1adaeef4130d5d20dd439675aa6ca95a96eeaf4315dae6c2ce25d88d0e9cab76fdceacc076ef3a39a62f22cf7bdb2149a09e1f387ed268 SHA512 ec0db8212930f95416ec8b9997bc7651a67fe10bc7ce4a47681b89a4f06dc900c8c857351e1724b1ac7d3a578132786f1c5e518f6d80bc94f95625ae430014b3
-EBUILD asterisk-extra-sounds-1.5.2.ebuild 1779 BLAKE2B 1a2645da3d69b2a115abfeff5c09b48fea0d038cd4ddf810274e4561affce9d15ab7adaa08208a3934ef0fb2625eb2e49f302cacd9f86fb0be987d56a23b8ff1 SHA512 996400d472f2ab49a9750a6f90b3db2af4d342cb6a65cfb34e4ee2d94a2b4b736b7d681bacdf456664610ec264dc547a6b37f73307e1f301d69f0e0accc5cb7b
+EBUILD asterisk-extra-sounds-1.5.2.ebuild 1786 BLAKE2B 079a7e1bef6455869698f2bb5b0ca50b5133d1b158d4e306373f1be4a616f7e613efaae1a081ec1beb587f450d6d826fc0c79bb82429b960b9662b18a383c0b5 SHA512 7914aaba31ffc04329ebd789a0e806f31032aa754aeaf6d5cba16c78fc82ad114723f8f634cd6f59e939bf67a7588799f51df08f85bfe1845fb49e64fcee07bf
 MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
index c34f0c39ef39..f90d3165f8f1 100644
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 BLACKLIST=("astcc-followed-by-the-pound-key")
 
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index fb9ade876569..cbbee1babd3b 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,6 +7,6 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
-EBUILD asterisk-moh-opsound-2.03-r1.ebuild 848 BLAKE2B 69efdca3a21222668f14223e43277543aac54cd0dbf69bc0e828c0472c9dcd7ad60f90142ea04e3551d198431417bcdc6fc93c869057c4ef1614d93a5ae0aa0b SHA512 40f2ffb239d795be47f3213857c8ae3ed5840346715a1cb32af64d759d23379b295de9a5aeda3da7f8178e787f0e6f380a88f4ee75d265d2853e5cffbfbd844c
+EBUILD asterisk-moh-opsound-2.03-r1.ebuild 855 BLAKE2B 1230d319edd882c732824eb2d84fee282ce538bcf3a50e7d3f0c57de4cc0ec2781acb4b60371c9757049e7a1fe42e824fbd4525267aead62f6ced5f32f1d3fdb SHA512 ecfa2a5b1f942921c7e051d0df029317832db8c8e2c9278f9ae39669f64ca39c3782e55a6aff4c098619828ee91b75e1a57f58384e08b6abeb853e2590e32eaa
 EBUILD asterisk-moh-opsound-2.03.ebuild 1140 BLAKE2B 7bdcca804e6f84086415dc3bbe06025b2225267bd261aefea6590fdbc048879db6f2d887862eb4f0d1fe41c573a2389fe932113dd2ba5a8c9e278e66281ca846 SHA512 feff1f6cbdb0786c81e8917a3a5a958d0ebc3d518cc98f93f8d2a2142cf745ab3b05616a15269e92fea082743e4d5f0ddd1f7b18daeb4484f1aa5c242087a7e7
 MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
index c05907f96142..d9031a7659be 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 S="${WORKDIR}"
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e8ff5e62b9b8..88419769b00a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -23,10 +23,14 @@ AUX initd-13.32.0 10546 BLAKE2B 857c44b74a411ab4ef5b9ffafb566f8f81949b40c685807d
 AUX initd-13.32.0-r1 9945 BLAKE2B 26fd8ff02e63a77fbe0712b745b9270fa58ae44d1dec4428bdaa93e1354b660dfb76b5969b5811add3b092302dcba3fbbdfdcd849cacb1f05fe645af9d73d359 SHA512 556fe37a67994989642b609443d94f990b23fd0cf037268b1ef9f66a9fdd93a79cb7f2e9ee10c069936b41b7f361abbb72836b1da759e646733e2f7c14d3195b
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
 DIST asterisk-13.32.0.tar.gz 33652378 BLAKE2B c6b0ca0895b25526c135332966f33761b74a88dec4a7b0ff0fe40263640ee2fb928eca29e716fba3cc8e96c6e395e7c70c36f41def6a0d055baac2a5c7b8637a SHA512 daafcd5d3544725e7a96bd467d998c4d74fd3c5d7e9d8fb4ce16e340ce09c502b1603e468e89c5a62b59282848b4ff0a43bdbcd75902cd11f6951d828511e841
+DIST asterisk-13.33.0.tar.gz 33683712 BLAKE2B ecfc122628c08e93fc389f111e1ee8ddcf3d27895437df9da5b83a6440c2135f9223a5605e0ef436e8585f8b023abba5b74680cac97f1700e1bc153872c1ed87 SHA512 b866a63cce7c289d32333b4b3b0a605c413b48fc7518976aa0768dd5c68894348d0de1c9bc7c56b73eb86b69e0fd9847d7226fa0f9e449f8ebb8a7118329db56
+DIST asterisk-16.10.0.tar.gz 27706766 BLAKE2B b8d7866fe3e8420ef5ce6ea5e016316f63e4f2e8904a79de69c4ddfb7aedcd00f09cfb414da43938af0771cdde387dcebfe716eb34e5ed1de3a30ff534459c7f SHA512 254c582593cf6ec691649d995a8d73260d2e340ad6ae65f0af62f6b8c3ef59c4da6ad9172bc04cc29a907d1e8d2ef105ae2ae20190b30115d5d402423c8c08cb
 DIST asterisk-16.9.0.tar.gz 27674324 BLAKE2B 991fb0146f5dea338a8c6ad98007e2ac1b182ac2ed7dbabd4143aa7f968dc353563ac4aba18bb07e9b0a705dabd1446319b06f4be284922a804d5c2dbddf6f7b SHA512 b8101fa3cc6068230b6b9a28a558415e7104b9bc3a8c0c245af34e9839cf1eb287739a2142ad0227d2fef41e6d40a5c01128a0b44a7ecaae13a00767d0fa8ab9
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
 EBUILD asterisk-13.32.0-r1.ebuild 9796 BLAKE2B 642d4b5a94e3a835e0b82e91717db6f0080a2d119500679bbd106828c6bec1b249e2fc7364bc019256e768dd7e991ea948f92f97b564add03b1511519a762e03 SHA512 445e85c57e6806a6224ffcb03c8e933f198f95ddd5991313afc2af3de24e669bd75a27ee061968229628394b2daf0f0416cb4889f6595e94f9f9a6f569ff377c
+EBUILD asterisk-13.33.0.ebuild 9173 BLAKE2B df9b4d5b2add191db0ea42765ae8f52a2b246761d689b1c8f7191f02475e0dfabe07b6ee318eb8ada7f83a47cf8e928dca46de5d4b898eb5388be89aff5db770 SHA512 461eb01828e69a9e294b0892a2bd01219ae39d51e80567dfbd38e50933f5fe40112c2aba05dc9ce14cad9f511fee92d692966411b032cb0a13d0672566eb6994
+EBUILD asterisk-16.10.0.ebuild 9313 BLAKE2B aa08c101a2531afe02059616da7cc4e621124f86ccbcada647d1f2acdde12bdc80d2abe69a391c06d20ad26416cd3c20187e326ad9689750273b9167bdacd702 SHA512 5d851d212b4edc89addbed9058b4108c5a49e1859bc10bdeb9341b39ed0b6563da335a29c427d95d7609429aeb4beece6c16af1592c0b4026879ca7c9e101715
 EBUILD asterisk-16.9.0.ebuild 9852 BLAKE2B db97375b52ca0d9cae392252e76af9270197c21c986bca673d8c815bf6c38affb1b3fa2c4d5e24d3822097db82d6e2fc661a67a349857c711a74d29f57914f0f SHA512 24f4f001a4c6c683eba65e7cb21678d612995ca6f48d6484a09d43d853209020de4f582cceae86237cf4ad5ea5130baec54161b278faf70fdd873e62d94af5ef
 MISC metadata.xml 1391 BLAKE2B dfa59edbb0e1e073171b7b335bec7c8188af06e97a88674c4a4f516fc42e4754044c8430af549865ff6bb18eb1dc969dbfa3b3868cc7b8964150581d200d946c SHA512 1dce9bbe1879a7a93ec9ca99a618722753251625626f15fcf9efbf9aa781f93084ea0f68857eeeb41664d82bdb2922ce75649c8627dbd9b46e42a7e825e3b3b2
diff --git a/net-misc/asterisk/asterisk-13.33.0.ebuild b/net-misc/asterisk/asterisk-13.33.0.ebuild
new file mode 100644
index 000000000000..85e6f8facee2
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.33.0.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~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 libedit libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-historic-no-var-run-install.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	pjproject? ( net-libs/pjproject )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	vorbis? ( media-libs/libvorbis )
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+function menuselect() {
+	menuselect/menuselect "$@" || die "menuselect $* failed."
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--without-libedit \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISE_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect --disable chan_misdn menuselect.makeopts
+	menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect --enable smsq menuselect.makeopts
+	menuselect --enable streamplayer menuselect.makeopts
+	menuselect --enable aelparse menuselect.makeopts
+	menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect --enable func_aes menuselect.makeopts
+	menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa         chan_alsa
+	use_select bluetooth    chan_mobile
+	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster      res_corosync
+	use_select curl         func_curl res_config_curl res_curl
+	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds      {cdr,cel}_tds
+	use_select gtalk        chan_motif
+	use_select http         res_http_post
+	use_select iconv        func_iconv
+	use_select ilbc         codec_ilbc format_ilbc
+	use_select ldap         res_config_ldap
+	use_select lua          pbx_lua
+	use_select mysql        app_mysql cdr_mysql res_config_mysql
+	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup    app_osplookup
+	use_select oss          chan_oss
+	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	use_select radius       {cdr,cel}_radius
+	use_select snmp         res_snmp
+	use_select span         res_fax_spandsp
+	use_select speex        {codec,func}_speex
+	use_select srtp         res_srtp
+	use_select statsd       res_statsd res_{endpoint,chan}_stats
+	use_select syslog       cdr_syslog
+	use_select vorbis       format_ogg_vorbis
+	use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	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.10.0.ebuild b/net-misc/asterisk/asterisk-16.10.0.ebuild
new file mode 100644
index 000000000000..70f8fcbc6f33
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.10.0.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
+	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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 osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/asterisk-historic-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 )
+	osplookup? ( net-libs/osptoolkit )
+	pjproject? ( >=net-libs/pjproject-2.9 )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	unbound? ( net-dns/unbound )
+	vorbis? ( media-libs/libvorbis )
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+function menuselect() {
+	menuselect/menuselect "$@" || die "menuselect $* failed."
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake NOISY_BUILD=yes menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect --disable chan_misdn menuselect.makeopts
+	menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect --enable smsq menuselect.makeopts
+	menuselect --enable streamplayer menuselect.makeopts
+	menuselect --enable aelparse menuselect.makeopts
+	menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect --enable func_aes menuselect.makeopts
+	menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa         chan_alsa
+	use_select bluetooth    chan_mobile
+	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster      res_corosync
+	use_select curl         func_curl res_config_curl res_curl
+	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds      {cdr,cel}_tds
+	use_select gtalk        chan_motif
+	use_select http         res_http_post
+	use_select iconv        func_iconv
+	use_select ilbc         codec_ilbc format_ilbc
+	use_select ldap         res_config_ldap
+	use_select lua          pbx_lua
+	use_select mysql        app_mysql cdr_mysql res_config_mysql
+	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup    app_osplookup
+	use_select oss          chan_oss
+	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	use_select radius       {cdr,cel}_radius
+	use_select snmp         res_snmp
+	use_select span         res_fax_spandsp
+	use_select speex        {codec,func}_speex
+	use_select srtp         res_srtp
+	use_select statsd       res_statsd res_{endpoint,chan}_stats
+	use_select syslog       cdr_syslog
+	use_select vorbis       format_ogg_vorbis
+	use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
+}
+
+src_install() {
+	local d
+
+	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	emake DESTDIR="${ED}" NOISY_BUILD=yes install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	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/bfgminer/Manifest b/net-misc/bfgminer/Manifest
index 5c64ec342aff..b7f582bdd4f1 100644
--- a/net-misc/bfgminer/Manifest
+++ b/net-misc/bfgminer/Manifest
@@ -1,5 +1,5 @@
 DIST bfgminer-5.4.2.tar.xz 1039200 BLAKE2B f63a7fa2c85d352a366794a39619599db6ccc3f98508ccd90387b315374227d74edfcfd2329db8b57c96539b194b0d2ee746cbea032c241dab1cf93e717b137d SHA512 b5ae8ae44df166d5576f89683ce9ee0832ca1f506b2522da7e3cd432abc5e218e9080e2a79f4da29e40db0d3179e63c9a8907d5d6b60d5d4895d6cac2b15d8ca
 DIST bfgminer-5.5.0.tar.xz 1054664 BLAKE2B db841a73bca10b19205744be531c13f2c4435bd69c9f2af7b8aba84381af640028cc4db33df399cf05dd0bbec7b79a5b65679bcb2a8bec7624f6fbc47e9ebd79 SHA512 d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb
-EBUILD bfgminer-5.4.2.ebuild 5078 BLAKE2B bc2e800efc60f278ae2d87851c515cef62b51ba8bdb9ae11ca826e26de9b30044d34f132772f392b1bcea0c11e2c62e5ec92bf799272011c9feb064645b21ee7 SHA512 0dfdfb130462f501cf2b2134fcaf215e4ff9e6dc5ba3935d8b1773a34e3f1336c329426892f3b81a9380efcb50d10cdc839a764e160e8fbcd3219b4bbaef330b
-EBUILD bfgminer-5.5.0.ebuild 5140 BLAKE2B 40d8ab029c46fb949f722a9db0036f45b64500e6a7cf5f8255e8b7dc188a1459033e43cd57b2c79ac6622314a9989031372855a6377dcdcc4ffda1bb99cb1a4f SHA512 bd78c293f402787a3952e88940ae68dcebe7b3760ca5ffe73c818eaa6dc38019a7fffa8c7c807903c228e360bddeb33438bc7c42c6c036917bf780b13cbdc6ef
+EBUILD bfgminer-5.4.2.ebuild 5051 BLAKE2B 9d00b36077d11bb18eb719e7b8d2addb77bf3bdb737ed8d0317f96e89106ccbe8363a166a18b487f6df5903c35b0eadd4b21116b037d5c61a38f8beebb894949 SHA512 a68f64e7151bca5a3213b917e9bbb755dff0004ae9c5a6a2f6c4dcda7194bae5a504f41492f1a5f8d3f860b9bd585783718351d92329815e504a69a888cf4461
+EBUILD bfgminer-5.5.0.ebuild 5113 BLAKE2B b1b2eb32c4e1dbbcd404189f76da4e89159837304184ca5ba977bac976f970aab872c3ceb4d31fa5447c8eb0f9410f1158eceab1f49252ac260124b891352183 SHA512 c7741ccc9997b1420d27478e76cb9d5e5543fa73f572455e4a175667a7af67f12d0c9336f0b8c51f40bff5070effe4e5ee234bb0a1d9ad993c3fc5d2d01921fa
 MISC metadata.xml 4029 BLAKE2B b9ed1a1c14386e3c4c3d11d40ae60988e2d7170c2363418b1dd9f33e0e32516bcf45ea08c96310d598173b43cd0fa23d7c1f6033656c3914ded0e685f39b6de6 SHA512 17f36d0d7f9055d1860acf7fe83f036184303cfa095d872f40877fd2f78cfb3433bdb01eba6c39058117dcbdbe5c7645e6b5eb0d24922288d34256c80624fa21
diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
index 2ecd1c526ca9..bcef66c8d23d 100644
--- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
@@ -94,7 +94,6 @@ DEPEND='
 		app-misc/screen
 		|| (
 			>=sys-apps/coreutils-8.15
-			sys-freebsd/freebsd-bin
 			app-misc/realpath
 		)
 	)
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index 457913d67bbe..1f145b5ad199 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -94,7 +94,6 @@ DEPEND='
 		app-misc/screen
 		|| (
 			>=sys-apps/coreutils-8.15
-			sys-freebsd/freebsd-bin
 			app-misc/realpath
 		)
 	)
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e730d743e275..678b5184d5a3 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -2,18 +2,14 @@ AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c32
 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
 AUX chrony-3.5-r3-systemd-gentoo.patch 309 BLAKE2B 933a8fb5dc5225d86aa1a97083755607df76e767c38c58ead1e1ed5e4c180502b31edfbc8c045f976d0b511d60d35562b53d1f0a5ab0ba8b306843cd95b8a9f7 SHA512 e2be0c5cf68cd899a3fd15bf129e664e795883f9912b300e2a1fa0a01f7ca9faea32edd3f1232c9be91e629d5fbbc3a58ec793bf6a73108fa0e58e40c861a0c9
 AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1
-AUX chronyd.conf 389 BLAKE2B 12ce24ef0455876ca9b74c5fb03000d720526c4da7dabf1dffb3c959861d5b0f677e2efb96bb5c00f7cc26b79cc77c0b6dfa161551bda5506a5eaac8d16dc46e SHA512 81400fb47fdac472c7508bb301e0dd662429c6ac3243e13d2719b1d237057a8b996163fbc14fa85a498144728d9ddf78275251d630e6800b0144a43792d8c414
+AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640
+AUX chronyd.conf-r1 389 BLAKE2B 12ce24ef0455876ca9b74c5fb03000d720526c4da7dabf1dffb3c959861d5b0f677e2efb96bb5c00f7cc26b79cc77c0b6dfa161551bda5506a5eaac8d16dc46e SHA512 81400fb47fdac472c7508bb301e0dd662429c6ac3243e13d2719b1d237057a8b996163fbc14fa85a498144728d9ddf78275251d630e6800b0144a43792d8c414
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
 DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c
-DIST chrony-4.0-pre1.tar.gz 506735 BLAKE2B f06afaa0ae653b549760e3b8e2e8a33f70450895cda99773e49fa70358bea637434fd18e55a73e53a2f8ccd92ae9ee4555dcea98afbcae9317b122bf1e1cb5b3 SHA512 0b850d57fded23ac3cfe5907edb2a2b8441397a37575ce3b4af54f3b8f28ae7ae74f92926f619e4907a24d9bc10bb6b416bfe3ccc9d567720e3511d7f9513c59
 DIST chrony-4.0-pre2.tar.gz 512765 BLAKE2B bfcac8564b05ed3cb6a67230746ec83d3f00192bd1d5e623ee12068bf3b7ca55e169a0228a13b62339be6a1c237199cd73186b1962ba51b445a56040560917fb SHA512 be3ca7c57c62c9ecf8d20d0b8d7b5a34ac455fb333be0587eabd5dfd7eebbcb3a3601ad161554a62098a9ca8d6530bee2900e9e7476bf477c3cb11907091dbd2
 EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a
-EBUILD chrony-3.5-r3.ebuild 3651 BLAKE2B a2ec4dc2e05214e1e61ecc256e17b14c842f8c8c62da916e3bcacae1f3089fd9057a68ec82e141758929ab2d1dba463a339d506572ede8636e3858ff8e82eb25 SHA512 35237e6f351ec77c44c7437bc0a53b0dbcaa6a19ed2e8969e6fb3e6c6fb603878eccef91ab23555b77d64f61c2d22dae85826658e23abf93b71097f3e3577e5e
-EBUILD chrony-3.5-r4.ebuild 4204 BLAKE2B a1ad1b37a923d1906c674845d02ad8d98f03aab15289a25434ebdb96caea353eb86f44db15117796c0af5cb49456cfced817f62de3bc2c2f5afda65c418744a1 SHA512 47aed654b6622fc8ca7c7da7e379ae976a20f94d7e0680b2d198a3eefb3a597534c32ec50fdbdaad5be0d8b05cefa173b57f4ef160a8155eb2d022a008da0b12
-EBUILD chrony-4.0_pre1-r1.ebuild 3774 BLAKE2B c631e7b12e294c70158f789711630774dcdb9272b370ff48ef6b215b4cd83a5b56c48d0e51d73622c382382d60192da31d6b7f55f47149049827a0e7c968b8d7 SHA512 6d45e89cf89fcd804fc1a1712a3c57a3098270bab932c8ce9c06a6f46f4524c259926b58dffc7578f1e07b18510d245bb4aefc1fa8da5df61db55165130d46dd
-EBUILD chrony-4.0_pre1-r2.ebuild 4327 BLAKE2B 54b7782fd9308616854671f883591c2e522a32db6341ac993806ae52b58f22ae04818d723cd9dd26c2261ede98cb03db0e8e40887ee0464889d8333325a5e8ef SHA512 f5fc438d0334dbce3724e8861410062aad276b097ebbdad39b02e3c99e94dd4d3b4e7362e288a4c3dda01b483e1ea31ae14c349dbbf36b2473ce7c757c684b04
-EBUILD chrony-4.0_pre1.ebuild 3165 BLAKE2B 2cfc0aa1e9a15db8ab1f7e9b6da1a25c0bcacc91158ab654109b5c5f4b89a4934ca382ca5be9605f266c06a8b01a2dabf83d65fe3362712bc8664bd2cb570f7d SHA512 9fd7e540db1f7a8161010c8a84d0aa658046c124d0df798827a1913bbdebb426b1c0b144793194fac6df1a49bfd4954b4ee1b816db344790f314f9141784f7d2
-EBUILD chrony-4.0_pre2.ebuild 4327 BLAKE2B 54b7782fd9308616854671f883591c2e522a32db6341ac993806ae52b58f22ae04818d723cd9dd26c2261ede98cb03db0e8e40887ee0464889d8333325a5e8ef SHA512 f5fc438d0334dbce3724e8861410062aad276b097ebbdad39b02e3c99e94dd4d3b4e7362e288a4c3dda01b483e1ea31ae14c349dbbf36b2473ce7c757c684b04
-EBUILD chrony-9999.ebuild 3536 BLAKE2B 8f2ff768eeb09b12197ea48b330c77eb415c43f6b498f98de9eb5f66637fd04dc653095afa5a7e6783832bfe4234e8ba82c3d70f39c0a7f61fff1f4c3963c3b1 SHA512 66030f49f80ea862fa18891572fc4dd231898f879790867a239878b46cefb647a2017d70a3aa3f8055b94337b0e06c251bacc1e816cf6b4e07877eca926b4eca
-MISC metadata.xml 1712 BLAKE2B 61db049bb8b0a659d24e10a25e9b36662607af7437a550615220a789342296a204d0e5c1240c8a5176f8eb2b98a5565956860ebb22c92cdb9b280ee817e68074 SHA512 c568b728b8939d8bca8809bfffed71c8e0cd57dcb5eed33d6d7af0ac2cfebbc2189568ef41bf0c8541b984c38b5351f040e0ac3fbeccf4f329d02c988177c9a2
+EBUILD chrony-3.5-r4.ebuild 4241 BLAKE2B c56c8d39161dec4ce49c3685e191c70efa5b0b9d82f42066cdcb41345126782e7c1ecaadba13967d6364b5b00bc949cb1e8cf2c2ebd57525b24c0f68ae022442 SHA512 617ab48f3792344be704e90808b53d1af30829678fa9644de03a43bcc693d54979010d30415d6ef5c9dc626fa55554bc3b0a4a9ef0a41151b1a3a7925aee5fd6
+EBUILD chrony-4.0_pre2-r1.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef
+EBUILD chrony-9999.ebuild 4636 BLAKE2B 39a67901f7237c0c91653f14038fdd4d8fb5739d4760d970559264c32a93cd02d61163002da7149b0dec6c9d36ceaa52bcf29954391087854d33d39ded9bb109 SHA512 10a5183f3351677bdcb4f6c54b23267e51f8053b8eacb8876e288b806cbfea31b83f8fd29b2e4747d218355876fc787a0a3158ba1f5efc567df97a4a8d6909ef
+MISC metadata.xml 1798 BLAKE2B c301fd829833515a78800677c498632a46ea968ad82f726b288ee3ec6bf79c733fcaea0b9a1777cf93e2a858da40beb105a301dca580e37e01b91111a38bdc17 SHA512 8609f9cb055d5de0a293cc78060101cbc30be4d3db6d7a8d751fa2bf416758e4c9d6509ce1890861c87d2e863e325051e68aadb4d621937f586e83ef585145e7
diff --git a/net-misc/chrony/chrony-3.5-r3.ebuild b/net-misc/chrony/chrony-3.5-r3.ebuild
deleted file mode 100644
index a654a6eb489f..000000000000
--- a/net-misc/chrony/chrony-3.5-r3.ebuild
+++ /dev/null
@@ -1,152 +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/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
-	+seccomp selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-"
-
-CDEPEND="
-	caps? ( sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
-	caps? ( acct-group/ntp acct-user/ntp )
-	html? ( dev-ruby/asciidoctor )
-	pps? ( net-misc/pps-tools )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
-
-	# Set config for privdrop
-	if ! use caps; then
-		sed -i \
-			-e 's/-u ntp//' \
-			"${T}"/chronyd.conf "${T}"/chronyd.service || die
-	fi
-
-	if ! use seccomp; then
-		sed -i \
-			-e 's/-F 1//' \
-			"${T}"/chronyd.conf "${T}"/chronyd.service || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	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
-
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
-		$(usex caps '' --disable-linuxcaps)
-		$(usex cmdmon '' --disable-cmdmon)
-		$(usex ipv6 '' --disable-ipv6)
-		$(usex ntp '' --disable-ntp)
-		$(usex phc '' --disable-phc)
-		$(usex pps '' --disable-pps)
-		$(usex refclock '' --disable-refclock)
-		$(usex rtc '' --disable-rtc)
-		${CHRONY_EDITLINE}
-		${EXTRA_ECONF}
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--disable-sechash
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit "${T}"/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-}
diff --git a/net-misc/chrony/chrony-3.5-r4.ebuild b/net-misc/chrony/chrony-3.5-r4.ebuild
index ae752af2fb58..fa28cf690097 100644
--- a/net-misc/chrony/chrony-3.5-r4.ebuild
+++ b/net-misc/chrony/chrony-3.5-r4.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop
@@ -164,7 +164,7 @@ pkg_preinst() {
 pkg_postinst() {
 	tmpfiles_process chronyd.conf
 
-	if use caps && ! ${HAD_CAPS}; then
+	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"
diff --git a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild b/net-misc/chrony/chrony-4.0_pre1-r1.ebuild
deleted file mode 100644
index 27386df76489..000000000000
--- a/net-misc/chrony/chrony-4.0_pre1-r1.ebuild
+++ /dev/null
@@ -1,155 +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/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
-	+seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-
-CDEPEND="
-	caps? ( sys-libs/libcap )
-	libedit? ( dev-libs/libedit )
-	nettle? ( dev-libs/nettle )
-	readline? ( >=sys-libs/readline-4.1-r4:= )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="
-	${CDEPEND}
-	caps? ( acct-group/ntp acct-user/ntp )
-	html? ( dev-ruby/asciidoctor )
-	pps? ( net-misc/pps-tools )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
-
-	# Set config for privdrop
-	if ! use caps; then
-		sed -i \
-			-e 's/-u ntp//' \
-			"${T}"/chronyd.conf "${T}"/chronyd.service || die
-	fi
-
-	if ! use seccomp; then
-		sed -i \
-			-e 's/-F 1//' \
-			"${T}"/chronyd.conf "${T}"/chronyd.service || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	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
-
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
-		$(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 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-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit "${T}"/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-}
diff --git a/net-misc/chrony/chrony-4.0_pre1.ebuild b/net-misc/chrony/chrony-4.0_pre1.ebuild
deleted file mode 100644
index 3f2cb339c288..000000000000
--- a/net-misc/chrony/chrony-4.0_pre1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="
-	+adns caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
-	seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-
-CDEPEND="
-	caps? ( 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 )
-"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-}
-
-src_configure() {
-	tc-export CC
-
-	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
-
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
-		$(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 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-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${FILESDIR}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	if use html; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/{chronyd,chrony-wait}.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
diff --git a/net-misc/chrony/chrony-4.0_pre1-r2.ebuild b/net-misc/chrony/chrony-4.0_pre2-r1.ebuild
index c4c8a13c29a9..0338e59678bc 100644
--- a/net-misc/chrony/chrony-4.0_pre1-r2.ebuild
+++ b/net-misc/chrony/chrony-4.0_pre2-r1.ebuild
@@ -6,38 +6,55 @@ inherit systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+
+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"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="
 	+adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
 	+seccomp +sechash selinux
 "
+
 REQUIRED_USE="
 	?? ( libedit readline )
 	sechash? ( nettle )
 "
 
+RESTRICT=test
+
+BDEPEND=""
+
 CDEPEND="
 	caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap )
 	libedit? ( dev-libs/libedit )
-	nettle? ( dev-libs/nettle )
+	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 )
 "
 
-RESTRICT=test
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -48,12 +65,13 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop
@@ -117,6 +135,11 @@ src_configure() {
 }
 
 src_compile() {
+	if [[ ${PV} == "9999" ]]; then
+		# uses w3m
+		emake -C doc man txt
+	fi
+
 	emake all docs $(usex html '' 'ADOC=true')
 }
 
@@ -167,7 +190,7 @@ pkg_preinst() {
 pkg_postinst() {
 	tmpfiles_process chronyd.conf
 
-	if use caps && ! ${HAD_CAPS}; then
+	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"
diff --git a/net-misc/chrony/chrony-4.0_pre2.ebuild b/net-misc/chrony/chrony-4.0_pre2.ebuild
deleted file mode 100644
index c4c8a13c29a9..000000000000
--- a/net-misc/chrony/chrony-4.0_pre2.ebuild
+++ /dev/null
@@ -1,175 +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/"
-SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
-	+seccomp +sechash selinux
-"
-REQUIRED_USE="
-	?? ( libedit readline )
-	sechash? ( nettle )
-"
-
-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 )
-"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
-	cp examples/chronyd.service "${T}"/chronyd.service
-
-	# Set config for privdrop
-	if ! use caps; then
-		sed -i \
-			-e 's/-u ntp//' \
-			"${T}"/chronyd.conf "${T}"/chronyd.service || die
-	fi
-
-	if ! use seccomp; then
-		sed -i \
-			-e 's/-F 1//' \
-			"${T}"/chronyd.conf "${T}"/chronyd.service || die
-	fi
-}
-
-src_configure() {
-	tc-export CC
-
-	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
-
-	# not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-		$(usex adns '' --disable-asyncdns)
-		$(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 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-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss
-		--without-tomcrypt
-	)
-
-	# print the ./configure call to aid in future debugging
-	echo bash ./configure "${myconf[@]}" >&2
-	bash ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	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 "${T}"/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 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 543cabf61d5c..0338e59678bc 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -2,40 +2,60 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 tmpfiles systemd toolchain-funcs
+inherit systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="NTP client and server programs"
 HOMEPAGE="https://chrony.tuxfamily.org/"
-EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git/"
+
+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"
 
-KEYWORDS=""
 IUSE="
-	+adns +caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
-	+seccomp selinux
+	+adns +caps +cmdmon html ipv6 libedit +nettle +ntp +phc pps readline +refclock +rtc
+	+seccomp +sechash selinux
 "
+
 REQUIRED_USE="
 	?? ( libedit readline )
+	sechash? ( nettle )
 "
 
+RESTRICT=test
+
+BDEPEND=""
+
 CDEPEND="
-	caps? ( sys-libs/libcap )
+	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}
-	caps? ( acct-group/ntp acct-user/ntp )
-	dev-ruby/asciidoctor
+	html? ( dev-ruby/asciidoctor )
 	pps? ( net-misc/pps-tools )
 "
+
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-chronyd )
 "
-RESTRICT=test
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" virtual/w3m"
+fi
+
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
@@ -45,12 +65,13 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
 		doc/* examples/* || die
 
 	# Copy for potential user fixup
-	cp "${FILESDIR}"/chronyd.conf "${T}"/chronyd.conf
+	cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf
 	cp examples/chronyd.service "${T}"/chronyd.service
 
 	# Set config for privdrop
@@ -89,15 +110,16 @@ src_configure() {
 		$(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 sechash '' --disable-sechash)
 		${CHRONY_EDITLINE}
 		${EXTRA_ECONF}
 		--chronysockdir="${EPREFIX}/run/chrony"
-		--disable-sechash
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		--mandir="${EPREFIX}/usr/share/man"
 		--prefix="${EPREFIX}/usr"
@@ -113,7 +135,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake all docs
+	if [[ ${PV} == "9999" ]]; then
+		# uses w3m
+		emake -C doc man txt
+	fi
+
+	emake all docs $(usex html '' 'ADOC=true')
 }
 
 src_install() {
@@ -130,11 +157,20 @@ src_install() {
 
 	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
 
-	docinto html
-	dodoc doc/*.html
+	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
 
@@ -143,6 +179,20 @@ src_install() {
 	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/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
index c04f3525f0b7..fc43a95c40fe 100644
--- a/net-misc/chrony/files/chronyd.conf
+++ b/net-misc/chrony/files/chronyd.conf
@@ -9,4 +9,4 @@ CFGFILE="/etc/chrony/chrony.conf"
 # The combination of "-s -r" allows chronyd to perform long term averaging of
 # the gain or loss rate across system reboots and shutdowns.
 
-ARGS="-u ntp -F 1"
+ARGS=""
diff --git a/net-misc/chrony/files/chronyd.conf-r1 b/net-misc/chrony/files/chronyd.conf-r1
new file mode 100644
index 000000000000..c04f3525f0b7
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.conf-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/chronyd
+
+CFGFILE="/etc/chrony/chrony.conf"
+
+# Configuration dependant options :
+#      -s - Set system time from RTC if rtcfile directive present
+#      -r - Reload sample histories if dumponexit directive present
+#
+# The combination of "-s -r" allows chronyd to perform long term averaging of
+# the gain or loss rate across system reboots and shutdowns.
+
+ARGS="-u ntp -F 1"
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 70ff1db23638..d13933dc6d53 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -29,4 +29,7 @@ Chrony はコンピュータのシステム・クロックの精度を保つた�
 <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 71fbef48d3cf..c3237b9fa439 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,7 +1,9 @@
 DIST cmst-2019.01.13.tar.gz 2576200 BLAKE2B 4b1c75c479651887a14d5b4266a99a36667c1d02f114c4a9886b5aaec445e320fc684d42793312d68e4eb3386ea8516aef3cecb705e37f8b9a88ea8bf5bcf512 SHA512 ba7cf94263b4908dc2a609216f82bd758ad727f623d65b2e876a02c1fd956b7090a8222e953a0cd2da9527eddaab918e9c735381c705b9943e9e8aaeeb00d835
 DIST cmst-2020.03.07.tar.gz 2722455 BLAKE2B d7119c6194596bc957793a9054f306ecedf84f8b57a8e7dcbbff0d49231c512cddbe530aa7f49428e8fe60abe3fb48616288a61d865845775958564da6d77a55 SHA512 43fd5fab8a2e4914557efd57dfa92d3dd7ec67f322b1eb1c25cfe90fa860254d1bcad9e31cddeddd3c1c5f8e1cca4cd33457a796607a6b008340d191c62ac5b2
 DIST cmst-2020.04.12.tar.gz 2726340 BLAKE2B 07d07c0d7cbe0f06f78a2fcea5381f026adf7aa6a603026aad53b0f35d96eb5c498267d9a32387163735188fa2814b894001562bbdc487116383c7a40e8a05d5 SHA512 f27087f06b8a74b54ac38f6874726ca2eb3bf8106eb4e3feb6c88909e980628dbb8a88a9c1da09efa48ceca9126b9edc7807558b6c9e8b9f7ab85c3f5b149a47
+DIST cmst-2020.05.09.tar.gz 2727228 BLAKE2B f24f05e14de589381dbfc7c0087d08eed23ed0ee4df23be7fd2bf25d8c36519771aca39e74942ec01fe6327b5ab52c74336b85f9b61da3d8a9b83c2a8312721e SHA512 9debc16d34fa8fed37f514c70282b7ccdece8da3612332a886a2b1b5c6f6ff86c046c5da6272c00836f0acc3cd6dd82321d3cb2f81784ea1512719b70eba1b6c
 EBUILD cmst-2019.01.13.ebuild 818 BLAKE2B 7fa6c5129b6a35dbe54d069ed904f99da29973cfeec447cbbfef7608f215dc6d93039601fb9887a761a32fc65c7077eeea9a91a5c2177408a3feab07d4c349af SHA512 e62a40db50996bf991f274930d9020039897c670a737953cef1785dbb0d25a8bfa6f1be74e0a5555ff7d705776499bbe4952a97b5641715958d0a1297d6eff1b
 EBUILD cmst-2020.03.07.ebuild 800 BLAKE2B 7fe1807c6b0ebfc5a29baa3c9942b88a81d85a0edcffa90358fb1425fa64402bea20a922fc64a5a9ca1901199d96bf8614ad624e78f51db4343b7b809fcb9b2a SHA512 f614ca72fdd68535095c74d01d00bff5054fab2a2e9d0eb6c8e14a3019268de37dac6257c833b4a348262ef6106280d957bc7df8bc407ea5abde6613e03c833c
 EBUILD cmst-2020.04.12.ebuild 800 BLAKE2B 7fe1807c6b0ebfc5a29baa3c9942b88a81d85a0edcffa90358fb1425fa64402bea20a922fc64a5a9ca1901199d96bf8614ad624e78f51db4343b7b809fcb9b2a SHA512 f614ca72fdd68535095c74d01d00bff5054fab2a2e9d0eb6c8e14a3019268de37dac6257c833b4a348262ef6106280d957bc7df8bc407ea5abde6613e03c833c
+EBUILD cmst-2020.05.09.ebuild 844 BLAKE2B 97bd9dd4423cbf8293e143b962e3365e96da3f4bd70ad1de04319e245ab898c3d1fe42ebf1d250109045b03b8ba5a3928019807afed1515fa22c38c2edb748a1 SHA512 052ad0cf61f8f8ed17bcedbc595310b72474dc20af061a1e2c8c420e61ebc6ff4f38cc8ad3a1a2d2011daa4868520f4905b22f34b7681d9e94d8fa93609a62b5
 MISC metadata.xml 389 BLAKE2B fa4bcb790a8e29dcfb5d87f3b675824dbd909a148253470189db24b6bd9b4282d1ddbd1dbedaec31f4d0dbe07cfdff0cc7331d6863842f5db7e597e7614698ee SHA512 b589825d436c4ad3b0781acc5b64cf044f056a70ca72f52cb0341b05e87bf8b269049dcef4e7a6acb8bd76c3a909eaa7c8a0bd77794e7266eb8e7cb7f6fbf7ad
diff --git a/net-misc/cmst/cmst-2020.05.09.ebuild b/net-misc/cmst/cmst-2020.05.09.ebuild
new file mode 100644
index 000000000000..02c5f056724b
--- /dev/null
+++ b/net-misc/cmst/cmst-2020.05.09.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/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 057b0240c592..0282b746e42b 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,7 +1,11 @@
 DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952478190c78dc50bc7b65d6229ec33593fe77be4a8c5b593d9ea8bb806f9b8d04768bc52b689b006640cfa34c176a0a1 SHA512 383540232593c7ef8c28f83e660a58ae6dd2592c6d97a43c8fc1f046a3fa448911d4066ec0a6a7d7e770a1a2dceee7c31d742100b0871e07d691fe6bdffd42f9
 DIST cni-plugins-0.8.3.tar.gz 2001599 BLAKE2B e087814146c53d372af5b1cc47098f0060cb1528618d9848287592c0b442856114c711ea747efca4e8a79e9ee0b4285678a6e48e07d0698f1382c1e822a49451 SHA512 054479a73ddbfbdb2986ac202ae2da7a69ae7bb693a250885f950a26973c60be3053d4e95ca24cf5eb67c104b9af8231f859e22c01a066ce3a206a186fc55a6d
 DIST cni-plugins-0.8.4.tar.gz 2002863 BLAKE2B afc0229256f04b5079ff4f30fca422e7e72dc46b01a988b38647bbed767ad4c8362c99eca84ade86a52ffbd3aadda60ae1b14974436eab862d4c9ed356320b2b SHA512 1a66a9d2cc3bad17201426905ed8349fa0c260ffef423338bc93c4ff191c4d38e6b9228ca3b5c44b148c854379f741f2dbd88ac9937dc1599f95f4df8b6f4346
+DIST cni-plugins-0.8.5.tar.gz 2003900 BLAKE2B e14ee6ca6979b638ed041a28d382867006b05843bf5b2c9c79386f4db590684b047af226a11b49e75b750e63927f3ee672cec54f12a1c7447550b8755a96b0bb SHA512 e404ef69da189e2cc3e77ae1054fbea5232086066f2963d1ec824f63c02aede020ad8600d821ec47ae695043bd2c4a176d9e02b9a059024ff3a2fbeee9cb797a
+DIST cni-plugins-0.8.6.tar.gz 1993056 BLAKE2B 89276e0f7fdbc782b30ff675abcb0f92f210771bb772269210416e17d6da443fe732774d9af8ae66f69847c8b48ee4dc6485f51e2156814cfd7e3ca8b455428f SHA512 8815de8b375c737c3a1951b0a7ef5786209fdcf723aa1bc7c2dab7e1bbdee4933a7237f41bdee4208828b457bc79ec69ff68db060c52bab13863f42b042480c8
 EBUILD cni-plugins-0.8.2.ebuild 1180 BLAKE2B 65c6677411bba468a5c77361326aff928a83651e3b7326391724e83a3f7c5fb89b81819d2e12217e2fca64568ce53f1aa0714fe7cf05a8cbfb3a4378687d43c3 SHA512 2a390ea446112f068067d6e5d40e5a2d96242d772593856a1cb727c424ac0afa4e3e0dabf53fbecdea0613873f72d0d3018a72444ae58235a5e69905b800be4d
 EBUILD cni-plugins-0.8.3.ebuild 1181 BLAKE2B 9cf5c0c0ede72dbf6454166a2a1fab9c9adcdc40277d2542b526f6584148f9a4416fb710a4f352bd4916d9c4aeb29386527cf86cce7a57deaa35a22e68b4e11f SHA512 0c14d1b3a0df0a397d3c0253592ab4e6d76cdad8335db44a960b74fcf1424a6c21e4c4fa54d8460db9db3d5c7e41404c1c6872536d05699f1012c466b15af5b5
 EBUILD cni-plugins-0.8.4.ebuild 1182 BLAKE2B 45476f645c86ca1518bf46315df141f515468c710f7fc78f792ec8ea10d0ddce300c8a645c07ba033833260e8e9f9ca77bdcd23c0a8c39b42161689c033d248a SHA512 a8099a79a4f6f2540a3e735eedf7688233d9f04cb77f682574d2492025998be573e864d02104d987e9e6c5ba72db9ff91c3fecf6af730bf191ab878b036d018c
+EBUILD cni-plugins-0.8.5.ebuild 881 BLAKE2B 9bc3401bdaa377bf0357dd1ab014815e6defbc27db766f8bd8dec7fa035a77ccaf212949d298cd7a2f85f9314fd6737dad2b2ca5a8421ea0c44b10ae03c5a3e5 SHA512 c4b2e4e942ec676a366cb4aba16ce095f10c88f38a6df0a7f31cc1fbefbb0291b189a3ee6abb6dd56c6d02e9b18cb9403feda1778dcc0d78916137d95bfd8f85
+EBUILD cni-plugins-0.8.6.ebuild 881 BLAKE2B 9bc3401bdaa377bf0357dd1ab014815e6defbc27db766f8bd8dec7fa035a77ccaf212949d298cd7a2f85f9314fd6737dad2b2ca5a8421ea0c44b10ae03c5a3e5 SHA512 c4b2e4e942ec676a366cb4aba16ce095f10c88f38a6df0a7f31cc1fbefbb0291b189a3ee6abb6dd56c6d02e9b18cb9403feda1778dcc0d78916137d95bfd8f85
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.5.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.5.ebuild
new file mode 100644
index 000000000000..999026880609
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.8.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+}
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
new file mode 100644
index 000000000000..999026880609
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.8.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module linux-info
+
+DESCRIPTION="Standard networking plugins for container networking"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://github.com/containernetworking/plugins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="hardened"
+
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+S="${WORKDIR}/plugins-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" ./build_linux.sh || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{bandwidth,firewall,flannel,portmap,sbr,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local,static},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+}
diff --git a/net-misc/connman-json-client/Manifest b/net-misc/connman-json-client/Manifest
index 995df32838ba..c1620f8e7517 100644
--- a/net-misc/connman-json-client/Manifest
+++ b/net-misc/connman-json-client/Manifest
@@ -1,3 +1,5 @@
+AUX cjc-fix-for-json-0.14.patch 1554 BLAKE2B a521777f66e34a425306c03f92096731f8ad93f6001930efabafbc4764ce698110a482063f53dcb0eec34a3ffae871407ef1ff53a6a918a6c809decee9b85cc7 SHA512 6a545259c2ffa4f9c5e628566890264aaf2be908e2a2a3313812777a28e1b57a60f1c8920f88f25a0574fe1a2e101c8dd020b51cb22ae1ebb851cca3b0f3bb50
 DIST connman-json-client-1.0_p20150721.tar.gz 55520 BLAKE2B 81f81721563bb8a7c4e604e8a036b162329f1334092f345438c34f787bceb8e548d69e0c206773b880799d1327858275bbbade59d1b84271e4fc05372937ce7a SHA512 77cfbc9f1b57ff5ce73a80f42198bbdb7120db6510f3f33251465ed83d1fac3b2bb41e3959f43cc8d274d37c8da375009a07e9003664482136eed64f5b32c0bc
+EBUILD connman-json-client-1.0_p20150721-r1.ebuild 743 BLAKE2B 595dbdb5c7fd0bad7c1f52f72fd358bc08111f8689c0cf1fb7637f709a14e8c714ab9c836d479a8e9591eddd8c483801c83e4c5af67555c4c22ceb3b3f79e5a7 SHA512 47981ff59de9d818f890829e7303ce4e9264ba9835dc95ac5c3b68bba66a95dc1dbe09e116a2102c4ee4334d067ad8f0aa5fa53ab51fa9380081df9d413b891b
 EBUILD connman-json-client-1.0_p20150721.ebuild 688 BLAKE2B 8ff4b658ab133591302bcaad1e0b326e3526e7322538f63350edbf0e94818bad9cfc74f3cda28cebbd50e52775400ed5c026cfc1e3124a7fcbe847f290964d17 SHA512 c7cd3fcf259ad093dc6ce3390ffcce967955207792aaa58f6ada4ea26d1bb3b01abcc0ae126d78b0a28062ff40591eaa36a8f8b6e584986b4ca4dc094ac9527a
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild
new file mode 100644
index 000000000000..71df6bec7998
--- /dev/null
+++ b/net-misc/connman-json-client/connman-json-client-1.0_p20150721-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vcs-snapshot
+COMMIT="3c34b2ee62d2e188090d20e7ed2fd94bab9c47f2"
+
+DESCRIPTION="An ncurses UI for connman"
+HOMEPAGE="https://github.com/eurogiciel-oss/connman-json-client"
+SRC_URI="https://github.com/eurogiciel-oss/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/json-c:0=
+	>=sys-apps/dbus-1.4
+	sys-libs/ncurses:0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/cjc-fix-for-json-0.14.patch )
+
+src_prepare() {
+	sed -i -e '/^AM_CFLAGS/ s/ -Werror$//' Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dobin connman_ncurses
+}
diff --git a/net-misc/connman-json-client/files/cjc-fix-for-json-0.14.patch b/net-misc/connman-json-client/files/cjc-fix-for-json-0.14.patch
new file mode 100644
index 000000000000..5cc8d55f3247
--- /dev/null
+++ b/net-misc/connman-json-client/files/cjc-fix-for-json-0.14.patch
@@ -0,0 +1,33 @@
+diff -ur a/json_regex.c b/json_regex.c
+--- a/json_regex.c	2020-05-05 07:24:03.294949374 -0500
++++ b/json_regex.c	2020-05-05 07:24:38.883944012 -0500
+@@ -64,7 +64,7 @@
+ 	json_object_object_add(jregex_agent_response, "Username", json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(jregex_agent_response, "Password", json_object_new_string("^([[:print:]]*)$"));
+ 
+-	jregex_agent_retry_response = json_object_new_boolean(TRUE);
++	jregex_agent_retry_response = json_object_new_boolean(1);
+ 
+ 	// See commands.c __cmd_config_service for a better idea of the format.
+ 	jregex_config_service = json_object_new_object();
+@@ -94,7 +94,7 @@
+ 	json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(tmp, key_serv_proxy_excludes, arr);
+ 	json_object_object_add(opt, key_serv_proxy_config, tmp);
+-	json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(TRUE));
++	json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(1));
+ 	arr = json_object_new_array();
+ 	json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(opt, key_serv_domains_config, arr);
+diff -ur a/json_utils.c b/json_utils.c
+--- a/json_utils.c	2020-05-05 07:24:03.294949374 -0500
++++ b/json_utils.c	2020-05-05 07:24:58.877379129 -0500
+@@ -83,7 +83,7 @@
+ 		key_is_trusted = json_object_object_get_ex(jtrusted, key,
+ 				&tmp_trusted);
+ 
+-		if (key_is_trusted == FALSE)
++		if (key_is_trusted == 0)
+ 			return false;
+ 
+ 		res = __json_type_dispatch(val, tmp_trusted);
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 44e1a634b810..ea6c22b593ea 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,14 +1,10 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
-DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164a77d7cb457924bd44c3069f1b03326861b73c51a6427d7169d40485a509f74edd89b99b760649e7adcdce693 SHA512 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29
 DIST curl-7.68.0.tar.xz 2442788 BLAKE2B d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269 SHA512 bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
-DIST curl-7.69.0.tar.xz 2466092 BLAKE2B e47abb6410dff25f642971646ce3bec3dd119e70a6eb53abc21826b315f88db2e180fb7cc0ea2a0435816a3b090cd2926fd1f27e02ba7aa75aad37ba0a298ceb SHA512 8c151201b09c51cc1437c2f6345036fce88ea5402cd1fd62b76c093e294b87d0c1f61e1dcf6f799f508d8dcfe381589a3815001a8c8bbc085aed0fdca6f2536d
 DIST curl-7.69.1.tar.xz 2467272 BLAKE2B 71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937 SHA512 dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
-EBUILD curl-7.66.0.ebuild 7562 BLAKE2B e6243cdad0e39f7f8ce7d2feb5d1c1441760e53a57c7eb3b50310d32df906e1a415b7bfbf0b4a8aefcd9c8d3623bab48ace68d100d9168ccf12bb52c4d6068d3 SHA512 8fa782ad7fa2cdad090d7808306cd173f6a23cfdb80764463c81ba7e75a268c69b9995c6559635a061c29d7ff54ee62bdee4c2a7b93af502747d65f9287dc246
-EBUILD curl-7.67.0-r1.ebuild 7587 BLAKE2B ed4a1aa8562cb3f651a83363967e465a02fbacede801851d04160cea6c01ef24f31758e6019cad1ac8e306f2530c2b913cd11ea80d282edf05644be0f24eb2bc SHA512 4c5b26f9acdb0f71b2e3a18058216cd7ba7d9a42227a9f53d4a4d3cdb33f78e12ddf833bff00979f5cb9c30c522aa94569a2be7a313a8dbe1c11abebd2f1a1d7
+DIST curl-7.70.0.tar.xz 2348780 BLAKE2B 6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf SHA512 ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
 EBUILD curl-7.68.0.ebuild 7600 BLAKE2B cc01e76a04b7023aa8aca65e65338279137fcf943ce474518fb807e9b4eaeecfb18022c39e8157a964168f73f07ab32c1e2553ad829ed5335f4f347506c45e45 SHA512 77bac8d7fd71c7f760ded2c96085e48c0f78b782cbde0b0449164e64c10ef527b2540ee7b8dc2dd3666560dd074fcf6b05d8d289798db3e12be2cf5b3a15f3a7
-EBUILD curl-7.69.0.ebuild 7617 BLAKE2B b74548fa09e5f6dfd32cbdfb863c4f692d952782ed085fb1e99bba0627513a9ffc60a7c20abac16b1e05a2ed2a78d9c285ffee8f357ab34dfb969d2540185b88 SHA512 9fa053a7aa0f2d4d797c20ec63c56e16de279c6a78558339972d95edf7361f07875a431ab5dcb08070f59a2c138b82a478e0f21007e051ada08d801d05466e38
-EBUILD curl-7.69.1.ebuild 7690 BLAKE2B 8aa5781870c3b39efee05703e0bb48f7c9962fe79396c23772babf7e0530a523d5eb97f549ad147ddc0baf3406c566b5a57133cb0346c153a541a94d27e3f1a1 SHA512 125c55575181e1e41616c185be42f30f2d647ce853e45578484661f59e9a6bb533bdcaea0e84a48b49f6162cc97df40ef3aa9ce3baf7ad9220137aef8ffa81e5
+EBUILD curl-7.69.1.ebuild 7689 BLAKE2B 6ebb15523c0c917566909676365e777b084deca51fc7b70c994c1b220ee14636db15b94f13b59c5a87e2d0db3e63c5cba70b86062fe67cf3969e8df8eaf857bb SHA512 634fbd2b51bec9d18b71233cbd13c1483713063442d73442749b7bc9ebee914b9abb0810d2291e9e14c969da3bcc575f9d00699ddc27b073b9a6ad37aba7813e
+EBUILD curl-7.70.0.ebuild 7714 BLAKE2B 360a1cc39ce2b4d49c209194d315150fe89c44393c381388e2a2dc97b02e7e59e61a85b7e39e86e316c0f5be0b25e1d5553601c81b5cb5dc64a91738da332372 SHA512 06460ecff9c0b62136d2e3dd1cade6cd2132f4f0ae23942f01e48a5c345057247bb1879bc505678c9d242f5f7a36e7dea9bbdfc9f457d55243d352417f4eb508
 MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
deleted file mode 100644
index 85a43d480223..000000000000
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable alt-svc) \
-		--enable-crypto-auth \
-		--enable-dict \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-dateparse \
-		--enable-dnsshuffle \
-		--enable-doh \
-		--enable-hidden-symbols \
-		--enable-http-auth \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-mime \
-		--enable-netrc \
-		$(use_enable progress-meter) \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-amissl \
-		--without-cyassl \
-		--without-darwinssl \
-		--without-fish-functions-dir \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with nghttp3) \
-		$(use_with nghttp3 ngtcp2) \
-		$(use_with quiche) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-secure-transport \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "libquiche" )
-	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.67.0-r1.ebuild b/net-misc/curl/curl-7.67.0-r1.ebuild
deleted file mode 100644
index 9fe9aaefbf2b..000000000000
--- a/net-misc/curl/curl-7.67.0-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/"
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? (
-		curl_ssl_gnutls? (
-			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_libressl? (
-			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_mbedtls? (
-			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-		curl_ssl_openssl? (
-			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
-		)
-		curl_ssl_nss? (
-			dev-libs/nss:0[${MULTILIB_USEDEP}]
-			app-misc/ca-certificates
-		)
-	)
-	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
-	nghttp3? (
-		net-libs/nghttp3[${MULTILIB_USEDEP}]
-		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
-	)
-	quiche? ( net-libs/quiche[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-#	rtmp? (
-#		media-video/rtmpdump
-#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-#	)
-
-# ssl providers to be added:
-# fbopenssl  $(use_with spnego)
-
-DEPEND="${RDEPEND}"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? (
-		sys-apps/diffutils
-		dev-lang/perl
-	)"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
-	curl_ssl_winssl? ( elibc_Winnt )
-	threads? ( !adns )
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_libressl
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_winssl
-		)
-	)"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
-	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/curl-config
-)
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
-	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
-	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
-	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
-
-	eapply_user
-	eprefixify curl-config.in
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# We make use of the fact that later flags override earlier ones
-	# So start with all ssl providers off until proven otherwise
-	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
-	local myconf=()
-	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
-	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
-	if use ssl ; then
-		if use curl_ssl_gnutls; then
-			einfo "SSL provided by gnutls"
-			myconf+=( --with-gnutls --with-nettle )
-		elif use curl_ssl_libressl; then
-			einfo "SSL provided by LibreSSL"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_mbedtls; then
-			einfo "SSL provided by mbedtls"
-			myconf+=( --with-mbedtls )
-		elif use curl_ssl_nss; then
-			einfo "SSL provided by nss"
-			myconf+=( --with-nss )
-		elif use curl_ssl_openssl; then
-			einfo "SSL provided by openssl"
-			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
-		elif use curl_ssl_winssl; then
-			einfo "SSL provided by Windows"
-			myconf+=( --with-winssl )
-		else
-			eerror "We can't be here because of REQUIRED_USE."
-		fi
-	else
-		einfo "SSL disabled"
-	fi
-
-	# These configuration options are organized alphabetically
-	# within each category.  This should make it easier if we
-	# ever decide to make any of them contingent on USE flags:
-	# 1) protocols first.  To see them all do
-	# 'grep SUPPORT_PROTOCOLS configure.ac'
-	# 2) --enable/disable options second.
-	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
-	# 3) --with/without options third.
-	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable alt-svc) \
-		--enable-crypto-auth \
-		--enable-dict \
-		--disable-esni \
-		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
-		--enable-http \
-		--enable-imap \
-		$(use_enable ldap) \
-		$(use_enable ldap ldaps) \
-		--disable-ntlm-wb \
-		--enable-pop3 \
-		--enable-rt  \
-		--enable-rtsp \
-		$(use_enable samba smb) \
-		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
-		--enable-tls-srp \
-		$(use_enable adns ares) \
-		--enable-cookies \
-		--enable-dateparse \
-		--enable-dnsshuffle \
-		--enable-doh \
-		--enable-hidden-symbols \
-		--enable-http-auth \
-		$(use_enable ipv6) \
-		--enable-largefile \
-		--without-libpsl \
-		--enable-manual \
-		--enable-mime \
-		--enable-netrc \
-		$(use_enable progress-meter) \
-		--enable-proxy \
-		--disable-sspi \
-		$(use_enable static-libs static) \
-		$(use_enable threads threaded-resolver) \
-		$(use_enable threads pthreads) \
-		--disable-versioned-symbols \
-		--without-amissl \
-		--without-cyassl \
-		--without-darwinssl \
-		--without-fish-functions-dir \
-		$(use_with idn libidn2) \
-		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
-		$(use_with metalink libmetalink) \
-		$(use_with http2 nghttp2) \
-		$(use_with nghttp3) \
-		$(use_with nghttp3 ngtcp2) \
-		$(use_with quiche) \
-		$(use_with rtmp librtmp) \
-		$(use_with brotli) \
-		--without-schannel \
-		--without-secure-transport \
-		--without-spnego \
-		--without-winidn \
-		--without-wolfssl \
-		--with-zlib \
-		"${myconf[@]}"
-
-	if ! multilib_is_native_abi; then
-		# avoid building the client
-		sed -i -e '/SUBDIRS/s:src::' Makefile || die
-		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
-	fi
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use quiche; then
-		libs+=( "-lquiche" )
-		priv+=( "quiche" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "-libtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete
-	rm -rf "${ED}"/etc/
-}
diff --git a/net-misc/curl/curl-7.69.1.ebuild b/net-misc/curl/curl-7.69.1.ebuild
index 6464b0ad2f18..cdec6acd02b4 100644
--- a/net-misc/curl/curl-7.69.1.ebuild
+++ b/net-misc/curl/curl-7.69.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~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 ~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"
 IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
 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.69.0.ebuild b/net-misc/curl/curl-7.70.0.ebuild
index cf06aa6240da..6d8ee271731d 100644
--- a/net-misc/curl/curl-7.69.0.ebuild
+++ b/net-misc/curl/curl-7.70.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
+IUSE="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
 IUSE+=" elibc_Winnt"
@@ -164,21 +164,22 @@ multilib_src_configure() {
 		--enable-dict \
 		--disable-esni \
 		--enable-file \
-		--enable-ftp \
-		--enable-gopher \
+		$(use_enable ftp) \
+		$(use_enable gopher) \
 		--enable-http \
-		--enable-imap \
+		$(use_enable imap) \
 		$(use_enable ldap) \
 		$(use_enable ldap ldaps) \
+		--disable-mqtt \
 		--disable-ntlm-wb \
-		--enable-pop3 \
+		$(use_enable pop3) \
 		--enable-rt  \
 		--enable-rtsp \
 		$(use_enable samba smb) \
 		$(use_with ssh libssh2) \
-		--enable-smtp \
-		--enable-telnet \
-		--enable-tftp \
+		$(use_enable smtp) \
+		$(use_enable telnet) \
+		$(use_enable tftp) \
 		--enable-tls-srp \
 		$(use_enable adns ares) \
 		--enable-cookies \
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index c6af187cde0a..f53bf8f49c38 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -25,6 +25,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 8042 BLAKE2B 59b69e87cfa0692280953f5610a6cbecff92718c5215a5511eaca5bd6f413c4e1c5878152196688af51fbf8781b988af880ab07e3cc58de0143d477f52ad30ff SHA512 11bd17a5987be0059fc74135cf58881e59c64798e804da5971ab4530b5bb67347944535b17f67a4acb4ce9f92d0b5e7bd9351e64c20b976883b5a96478562d20
+EBUILD dhcp-4.4.2-r2.ebuild 8035 BLAKE2B 9ee23fa63735e0e20de2901fb3b21a7e5669e2f8c314e1dbdc31f0e8e10ee024baeefb7f44c1c2ffa9a0dfd4d64b1f19dfff745d076d953c55fa64b1a4227045 SHA512 eab39eeac589a57a52bc7220fe79a9b84fd9c7ce8e489eeda4a1c7a9f8b3f685c8fa15856dfd1c1b70e502589c98b3bcfd820cd4727800e6898a6bfe56c3b5a0
 EBUILD dhcp-4.4.2.ebuild 7930 BLAKE2B e4a9d780010707cf9f16816f29ccd1a9c0ebbf961bd89e6c05a1516a5a97c6900a3a04e6435ed4bd00bc8874dd126d6e87d95e1147933f72b1ae8deac2acc6dc SHA512 40b769fce9749bace22ebdabeabfaf44251b03a07bb8dd186c8af5238d1cbdd89a40e59205fac287f576b2fe5d2152371e7f1244c5d22daa2cf158d0814bc9df
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
index 8adf530720e3..0257824a08f6 100644
--- a/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.2-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index f5e130e0a366..24f1053b1a5d 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -9,7 +9,7 @@ DIST dhcpcd-9.0.2.tar.xz 244800 BLAKE2B d0c355141aa1e57715c30b2902eed7e2821f2c08
 EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
 EBUILD dhcpcd-7.2.5.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
 EBUILD dhcpcd-8.1.7.ebuild 4394 BLAKE2B 4e6c828497b44ffd2e25f7985b5f0144209d7c1ff7ed07b995a09cce5bc04ddebecc49fd0f1faa569fb52d069ab8d80c30595e3c2570a7af272e7162b335b6f0 SHA512 79ed085c66bc51e87e2ee4f327b5604a571cc3daf6a41fe949baa37c9245749c37d1e054a070c72da2d7da7b0ad7e5bb1c5f92834be7d6f79216dff268783780
-EBUILD dhcpcd-8.1.9.ebuild 4387 BLAKE2B 15b4845928419d3bf8abc9ec5ea57952388374bb7a28d40ed67e47225376c942e7c710fba4b2947bc13c68244164a1212ae12ef2b09dff1f9d607b2b077cbcb4 SHA512 0e847fdece1b953ec7d0c4aae67e6124c508fbedda378d38f09233227aa1941bd44dd5629aa398db0fda49cfbf78e216eed8663d28d892e904a8504e768a0c74
+EBUILD dhcpcd-8.1.9.ebuild 4385 BLAKE2B 858612ce43483bb8a1c04f6dd81847ffe8519dcfba2fdaddc6bbb6e370a3734ac8349bdc12af2f1594779280c28e20c390ca25a97a28df6dbdee45aebbfa7fe7 SHA512 f69f3beea8ec74c02b2ea5d9a3653c9d7edf8e947721b243ff8c5df54e68aa352346080fc1f6db36eae8b851c93eefc978d6345153c0b96ffc4cada0bf685021
 EBUILD dhcpcd-9.0.1.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
 EBUILD dhcpcd-9.0.2.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
 EBUILD dhcpcd-9999.ebuild 5279 BLAKE2B 9d18fbf073399faf0325d8d16a46c14595546a68a65b2959c3a61082985d685bfccf9808a8b9fec020e3de2c3b4e73f1478db59bd773967e4012ceb31b30d03a SHA512 779769068a9128d816c3f00aa1fb11d232d6532a77e105fc8b483aa7eb090ecb7d86f30051b57eee549cfeb723c6bea409a1213ad552ac66102edaac41c5467a
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild
index 1133080d8aa9..54861a24f9cc 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.9.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index 6fd4f0e73e84..d29cc9155649 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,9 +1,11 @@
 AUX dibbler-1.0.1-fno-common.patch 562 BLAKE2B c6219983aa421c20aecb345d12000eb6130bb0a785f8d9283c58220f5a330086137a5351111016b797cc79e37c5bf81cf0b435f6e7f48bce03bf657e82651b72 SHA512 2386188ca1760f47bea0727bc25c4c9b30086dc8948a7547d36df8b4c7f40b871241ec51b30b3e516b1642baa530ba2ce61222a85d95a4bcb45edf159482e512
+AUX dibbler-1.0.1-gnu-ism.patch 2164 BLAKE2B fcc92e4f66aebfefeba339a24b91a6a6d7f65e487e3660c288cb23a0188acae6d9f04f73ee565ca700626c53a94f726ad6febb4390cf2e349a59999d8969cebb SHA512 0638be70e2e1cd72db0bcc7419b7731b5a4d1b38e2b42b8d7e6bd04dc41189787664e86cc255d033d6a1a834d1e46f16bc8f924eea7cd02aed5a29697e32a9f6
 AUX dibbler-client 354 BLAKE2B c2d9359fdc169513c5c208591b048a9d5f93443e21a95c78d296f6e68bd5a7f3caa79bb8d70bec766e2a15f874e9fdb52bc231a8ae460d3f2ffb9e92f34ff9e1 SHA512 2ef18db1cd172f40291573a6f34209d6841f39f90b14a0731abf54cae6fbf90850d1cbeb3d6d985f0f9957c5a4228c794fc9b8d69c716bf0df7ee857b510de66
 AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114e0bcd2ff444c2f1f65b875c6c58aa70431118f07c54a6ed07a086856d8f9c64978288e116a2779e8ee7596c SHA512 419e40ac4110061e675cccd351b5a3e5f46e0c62d5169feb97eadee805d99b9caaae5f65fb9433808081d670db1cbb5ba6d9776e794f4cff624ec85906e28613
 AUX dibbler-relay 348 BLAKE2B c9a8d1f2b130e00e9d0f4ad517fc5256ec1d09cde6b66c8641cdf6b171b170944866842d76a4619f2294dd30de9670dc45775d16253e96a1ee4a668ece576285 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745
 AUX dibbler-server 354 BLAKE2B 08b1177bbe9f3f1f1be809dd9f3617368257072e22ad6fe1e1a671429a2e488ac47d2902defd34b60b0adf9b6aaf0db119c8edb4c4ce8d510df8e0f0a8b260dd SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5
 DIST dibbler-1.0.1.tar.gz 4375118 BLAKE2B 1418a20ecf96f0793b25165d2790bb12aec0dc9ffbdf248f996f736e375f466a5853f698bc3da753dae57db4493a662cc8962e5d1fb6d9dd7c0c9d893128773e SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0
 EBUILD dibbler-1.0.1-r2.ebuild 1377 BLAKE2B 564d335fb52c3c4dd702028a9d706caedce5e26d8a2762dcac524b65028ad94389d4ea0b1aa1ad4c647c214907a819a96a4c17584350fd2aa988a534712bba8b SHA512 717e52ec0d5c90e708f5437ffa294e34fe1c548e9d3fb923466090f14c9e66853901018877832369a7c6f38f53ee3b706ecd1f2ef8799f46cb199dfbf96e26f1
+EBUILD dibbler-1.0.1-r3.ebuild 1412 BLAKE2B 136b4d9aad708120816016d2663107b70a23a95fffb45badee12ad90a85ebc0c7d81a339ae2f499e322c208b938c531f38405a37ea11992d8881f6d6ce32a891 SHA512 209526ea3daa1b5fb48fca5f986f3ec0bc99ed15907b0c7fc2b1f11d7d15f140bbb5eebe067c9a68abcbe180f8b313b754b90b17eca5f7c9024ce1e7946d5558
 EBUILD dibbler-1.0.1.ebuild 1232 BLAKE2B 5d096c882545cb1c0dcb50e5dfc8cb6787cd100aa3ddf5e92df19695e04d3abb1cb3b9eccc115b9514273746bf232ee64eed5adf2723374ef63bac0bdcdda831 SHA512 a7a2693956d8c9cb85023dbe460899acd3f9fea9bc673558f9a15f2e6c2acad694ed918a2e9b8dc4b2c5c1ff0dae202ef405f3620e4cbcbf962cbf08c36c6d9b
 MISC metadata.xml 350 BLAKE2B 88539009202645f314ed13bd5d4ebca86b45658a3d9de79596c337b262f6a37911efdb52defb0ea6e6a07ef8977cf1f3410a5d19359197df1d2c769f279856a7 SHA512 41de174499d1f04980b349af4c88d4fa396dee28edde06eeda3a144bed48f2a20d333f4b6ea7f0137e9ebbd3f47cc2019960084bec1bb8525daa6c06da90c0e9
diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..8db74de7aae0
--- /dev/null
+++ b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
+HOMEPAGE="http://klub.com.pl/dhcpv6/"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86"
+IUSE="doc resolvconf"
+
+RDEPEND="resolvconf? ( virtual/resolvconf )"
+DEPEND="${RDEPEND}
+	doc? (
+		|| (
+			dev-texlive/texlive-latexextra
+			dev-tex/floatflt
+		)
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-gnu-ism.patch
+	)
+
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
+to suit your needs. They are stored in /etc/dibbler"
+
+src_configure() {
+	econf $(use_enable resolvconf)
+}
+
+src_compile() {
+	default
+	# devel documentation is broken and users should consult the online version
+	# http://klub.com.pl/dhcpv6/doxygen/
+	use doc && emake -C doc/ user
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	dosbin dibbler-{client,relay,server}
+	doman doc/man/*.8
+
+	insinto /etc/dibbler
+	doins doc/examples/*.conf
+	keepdir /var/lib/dibbler
+
+	dodoc AUTHORS CHANGELOG RELNOTES TODO
+	use doc && dodoc doc/dibbler-user.pdf
+
+	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+	systemd_dounit "${FILESDIR}"/dibbler-client.service
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch b/net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch
new file mode 100644
index 000000000000..aedc3e81cbba
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch
@@ -0,0 +1,83 @@
+From f8352ac6dfc61a99b1162e0fd28d30b1e9340fde Mon Sep 17 00:00:00 2001
+From: Robert Gerus <arachnist@i.am-a.cat>
+Date: Thu, 11 Jun 2015 21:34:39 +0200
+Subject: [PATCH] Compatybility patch for musl
+
+Minor header/include/typedef changes to fix compatybility with musl libc.
+Doesn't break compatybility with glibc, as far as I can tell.
+---
+ Misc/Portable.h.in                     | 4 ++++
+ Port-linux/ethtool-local.h             | 6 +++---
+ Port-linux/lowlevel-linux-link-state.c | 4 +++-
+ Port-linux/utils.h                     | 5 +++++
+ 4 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/Misc/Portable.h.in b/Misc/Portable.h.in
+index 1a96293..2d94d0d 100644
+--- a/Misc/Portable.h.in
++++ b/Misc/Portable.h.in
+@@ -29,6 +29,10 @@
+ #include <arpa/inet.h>
+ #endif
+ 
++#if defined(LINUX)
++# include <sys/select.h>
++#endif
++
+ #include <stdint.h>
+ #include <unistd.h>
+ 
+diff --git a/Port-linux/ethtool-local.h b/Port-linux/ethtool-local.h
+index 2940090..555f06b 100644
+--- a/Port-linux/ethtool-local.h
++++ b/Port-linux/ethtool-local.h
+@@ -22,9 +22,9 @@
+  */
+ 
+ typedef unsigned long long u64;
+-typedef __uint32_t u32;        
+-typedef __uint16_t u16;        
+-typedef __uint8_t u8;          
++typedef uint32_t u32;        
++typedef uint16_t u16;        
++typedef uint8_t u8;          
+ 
+ #include "ethtool-kernel.h"
+ 
+diff --git a/Port-linux/lowlevel-linux-link-state.c b/Port-linux/lowlevel-linux-link-state.c
+index 7ca9f6b..76293ea 100644
+--- a/Port-linux/lowlevel-linux-link-state.c
++++ b/Port-linux/lowlevel-linux-link-state.c
+@@ -18,7 +18,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <bits/sigthread.h>
++#if defined(__GLIBC__)
++# include <bits/sigthread.h>
++#endif
+ #include "Portable.h"
+ #include "interface.h"
+ 
+diff --git a/Port-linux/utils.h b/Port-linux/utils.h
+index e40d95f..579dffb 100644
+--- a/Port-linux/utils.h
++++ b/Port-linux/utils.h
+@@ -1,9 +1,14 @@
+ #ifndef __UTILS_H__
+ #define __UTILS_H__ 1
+ 
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE 1
++#endif
++
+ #include <asm/types.h>
+ //#include <resolv.h>
+ #include <linux/types.h>
++#include <sys/types.h>
+ 
+ #include "libnetlink.h"
+ #include "ll_map.h"
+-- 
+2.4.3
+
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 1b19b3994d7f..8665a17ea7d0 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,7 +1,4 @@
 AUX 0.6.0-gupnp-1.2.patch 2449 BLAKE2B 25aba7b48ef6dfef1d1dbe1c229fefc8c395c8ab1b393a49b6382662437137f628a7e4565aff701331375aae89fbdc3d6b8408d606694ca540036eb87743415b SHA512 9f0ba14980cb9238b576f40802c11e718a42576fd5f33fabf0ff4a2be186533bc6113ae88f1d554894d2205b7824a3a83f7fb99b43559a1c0add8ee07c8adf48
-AUX dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch 285 BLAKE2B 5425885163b4df90ec99ff0756d1d1da0b0336a73790f1f1c3e7c2ed40b51c78752705a229313d4e35503f62acd3d521026cc7553c154f35c464de5fe53dcf48 SHA512 76df25eac5b3b0d726089e98c38d8280bf3a72dfa830381f3b6a9a31df10abe31cc53c64e75f2fb12901130f243377392c607129821ca7645929ec2696bd88e4
-DIST dleyna-server-0.5.0.tar.gz 412938 BLAKE2B 532e1a418708d84dabd98670d84c865b6f69252cbd851504bd2d75bbbf683b699a47513a6ae994f809f3993a67815d5a3ee53683a016448c76d604fed040aceb SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398
 DIST dleyna-server-0.6.0.tar.gz 107573 BLAKE2B c2460d20ac12d377170fc1292efa48ccec218b7c8e6f2d463a159bda801a7e9a5cfd239e51bcf9d997124a0a9ff305f3a4047228d54a55b26407fb1e37b2e238 SHA512 5fecc48f72afdac46da04d1785cf49384ed84b078802e4703cd86dc8e2c5db64df0232f66b73c73b3f358f7248117cd00fa4652397619d87f8f4a305e047306c
-EBUILD dleyna-server-0.5.0.ebuild 885 BLAKE2B 9ae97dc70d8a4925a1f388ce79e001d946333bd8d0f0b96e8a9e9029ef5ac59bedef3c6a28088edc29cf265f6f75d49622d410df46b5160350769f2a60ab0a14 SHA512 c3c68d394a3ff2640d7cdf3c86b5a90756c92a7df5368fdc737682a417ab43f6b547d6801642520fb4654c5d8f94ec3031a3a8bbc6649160c5a6b6e19bca452d
 EBUILD dleyna-server-0.6.0.ebuild 841 BLAKE2B e5014558bdd82997482c12db73ad825001fc73adb1196db18d6979f399ccb56dc531d8470e12a1d4ff70f1c6e51ed7625aca13990bd540a2a0aaf4426c1163e5 SHA512 99bfb47d58eb2590508b8213c87fe830c9b2c9ad79648c47e89b5050fcd201ba4043db829b278ea0e2e8f937b99fba066efb8f50f92316547717f3d2791485da
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
deleted file mode 100644
index 658b58777b19..000000000000
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils ltprune
-
-DESCRIPTION="library for implementing services that allow clients to discover, browse and manipulate DLNA Servers"
-HOMEPAGE="https://01.org/dleyna/"
-SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	>=net-libs/dleyna-core-0.5
-	>=net-libs/gssdp-0.13.2:0/3
-	>=net-libs/gupnp-0.20.3:0/4
-	>=net-libs/gupnp-av-0.11.5
-	>=net-libs/libsoup-2.28.2:2.4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix build with recent gupnp, bug #597952
-	epatch "${FILESDIR}"/${P}-fix-references-to-GUPnPContextManager.patch
-	default
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch b/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch
deleted file mode 100644
index 9efb1feb1906..000000000000
--- a/net-misc/dleyna-server/files/dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build with recent gupnp version
-
-Gentoo-Bug: 597952
---- a/libdleyna/server/upnp.h
-+++ b/libdleyna/server/upnp.h
-@@ -24,6 +24,7 @@
- #define DLS_UPNP_H__
- 
- #include <libdleyna/core/connector.h>
-+#include <libgupnp/gupnp-context-manager.h>
- 
- #include "client.h"
- #include "async.h"
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index 3063508945ac..a23b43913b81 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -2,5 +2,5 @@ AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c18
 DIST dropbox-cli-19.py.xz 13960 BLAKE2B 16d33155cbe5449434ff9fc5a9fddca9a7cd20bd3ff8fc46f4badcc30d71f6b0b6adde6f6d0ad73702e4dd2957cc00f88f49b2580c289525784f97d4502e008d SHA512 b5ea1632c135232f4705a0e95419d176638e6a830a2a7d32f955c615328097b987887513cf06103b452a7efe2690ffe351a275267451db9d2998d19ac6f8f85f
 DIST dropbox-cli-2020.03.04.py.xz 14304 BLAKE2B 600378cbacd6e96c16e1c8464261b260f2d8919ef5f361c4f337386d3849294cf8557d44f1c5d4f5682eadb2f15885a16b0a8fa162929665e518801d23ec35cc SHA512 c6c8f2f3fb08818388f5ac812821a1530214ad18d58191b08092852aa953e2947871145b46a4df4debeb629a870e1182a47fd5a8bdf8b22144e686e19ede689a
 EBUILD dropbox-cli-19.ebuild 710 BLAKE2B 9ff353fffc498a9a9697fafb9ea962c1f8cb83787ff62cbba815e83037dea32b4d8bc19f93c586c07f6abe3707176f8e9c2328b3b37d47d3b3c71c5de28a690f SHA512 c996a797a31da15c1354a17ba1eac71335e862f4033a34936861363988638727b701ebe47615974689696d834cb93ebcde90777822172340dd129820c4416e54
-EBUILD dropbox-cli-2020.03.04.ebuild 722 BLAKE2B 831c03566080d63a5ed9d39d4a620bea1bf9e45c47dcbf734edc1567c136de354035989e7d046fbaff869443b3bd78ac2484981a4ca85cd71a53cc2b88c244f5 SHA512 2530173af19abbf11702cab442fec1188dbfe2161a1687ffb08d00be0bdc37550ca12bfe39898ae5e25e01cc6cab899021932d318a1cc6fa46e0edd1415c142a
+EBUILD dropbox-cli-2020.03.04.ebuild 720 BLAKE2B d041397b601cbd371ec344f745b255af5b800609bb66c2779e79225e4914b73af8de462c23bb64f06a405e285e39e99046abab83e7080b0199bfbef5f871a2d3 SHA512 a861f20fd3526eb1e1bbb1f0b5c16f2ca67bad0840888cdbccaa9f2997d413f2c16c2dc1c03d5ebbd1932c8db24832261062567e99e042ac0e324bd021050c97
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild b/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
index 6980da3d4fb6..52ba5ba4bb1d 100644
--- a/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 5b3120c5fafc..a0eeb85c84b2 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,9 +2,15 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-94.4.384.tar.gz 94254443 BLAKE2B 4d12d0268ea71f4d06304dbe29bcd54f3af4c39e10ba8be4892724c6dc556dd844e587f789cc957dad66d7bd44ae8fdac398cefbfb714a8b01d7f8c06b1d6d50 SHA512 710af644cdaf88a6db26f86b2cafd1bb729b4cd52aab4a3328c9c3061183db32db016adb6d8dc9c5a2fc860a55c3abc712a774ac3e635459c605e91c0178c37e
-DIST dropbox-lnx.x86-95.4.441.tar.gz 94501019 BLAKE2B 9f0a0d35bcfc75bb4a8418d0aa19448cbf5f2d5a23e0f5fe032a08e6d467ae3e157c8667abc5c73584000a347929daebd250d25051e2586ad42c58313d1dd694 SHA512 3b10df33f182faa10866b325e486b35aeed056b0cc80bc8dd8a8e44d085d114f104f51591cfda7329ea1c2d0a698c4c300765d077ef1a866464d393b60af329a
+DIST dropbox-lnx.x86-96.4.172.tar.gz 95619165 BLAKE2B 3d839e3ea9e1b9a7399693e8540230a8bd173b1cbe7fb9ee3a85621f6a3c59bc8c2c58d2f8e0f0998dcd9b0d77cbfcb006c9b543609546efca6ae8d85817b5ee SHA512 83ee64f7db74742c375fca8fa661da0774c3ec451cfe6cc71e5879427e8f822ae9f533ca2920bc01158b05dd52fac9f89fb3bd8928a2a71c4df4162f67547e22
+DIST dropbox-lnx.x86-97.3.451.tar.gz 96560209 BLAKE2B 9ca8b50afddb8e0435cc1e408fdb10a12a1097baebf7241033661ac26e5d8c369b09bb6dfe707d1f0f3f6a79832ff0ae097eed859b0a3612574fb69d9d74fd47 SHA512 d50ba534f3b7b87755d09ffb216cc8741f0d520c088577fbda486aa4debd7317fd87fa7a86a0131800b1cdd75a60f2ee6c1b7d264a8e75b11d7d619e509f221e
+DIST dropbox-lnx.x86-97.4.467.tar.gz 96556504 BLAKE2B 1959c134126870e2d86b925766db9466be49fa0f71caeadac79f529194e85afeb4b45e47507a6786a2dc91cdb1cd976ec02110dac2c9d2abd71d789fd81204ac SHA512 fa056a96c1dd68f8c691c21b73d6d7159472616d2d67611a7ee01cb9b6bc4eeceed04087cb77114d6a62a715cbe82f828c6e75e4e92d3a4ce88ca7bbc2d71dd4
 DIST dropbox-lnx.x86_64-94.4.384.tar.gz 98561877 BLAKE2B ff1ec6a8f76b9b79ed3cfe34d5dd5642886d01631bba062ba15528929e1068425fadc403c8a7fb3242b08c2d2742a2f4ccd255c8772691ee1e4f1b8693be4dcb SHA512 e905b283ef435d7b6c0d7973f49e8c0a4a5e7c25c2570967b24bb8476ef1889f63d01e7951f1c6d78a5c6851e1a30737b9297032dede1540e3bf391c56bc0c8b
-DIST dropbox-lnx.x86_64-95.4.441.tar.gz 98809031 BLAKE2B 36dbce71cee6e2df69187e6fb4ad1a4534561bd871a9d5bdbe8952f768f658ac3ac47adca68ec68be2ccb3e4a780ac7e67b4898e33d2763ea0e6d384dd85bca4 SHA512 66f83fd4f3a770cac4879edb21635941ae11b5f83113bf8a0efd2365d957ee7ea9e65a602e635131c57cd47057092757c8c4c3f03558a5dc63863e8a0a9c7d7c
+DIST dropbox-lnx.x86_64-96.4.172.tar.gz 99944904 BLAKE2B 0b9b6c3d283de2751df9c083f7cf4ec8bd013def2a6cacc1a006e5a66ef5d0451d5c1faef3b10d7295ff3c23b941e48248126064e9eab6391e11ad7c193ebb01 SHA512 1aaf4b3e88e047f184af813d80e7754649ab33f2337ae1555c7d408d3358195e48cb0b1daaae1fe6f8a1e572ea087960eb2bda2413158f60588e022f5f01136f
+DIST dropbox-lnx.x86_64-97.3.451.tar.gz 100909755 BLAKE2B 75de9da05ebdb1c1da0d604d8e7aff3fd1fa5a6b9f281cb8ae20f673ea05f0a4af775d6c5926fc5962782c896a71aaa48651c7b49e05ed4bc783f64275b1fcce SHA512 501e8754717a91b1fe01ebe5f895341b3ab74da97633faadf3bcf81735672efd6beffa87125aad7e32e851ef656cf5ba8951e57ecc6180a2f3b77af37a629e65
+DIST dropbox-lnx.x86_64-97.4.467.tar.gz 100899563 BLAKE2B 0ab7b98d9e1394ce997aa456157a85586addb0c82f47d831721bd36a716cb3117b280e2753040369bc04d5a0360a3861a34e9381dcba747fdb4a38e11d4dd34a SHA512 05ddc063c9dcfb8b9b03f93f0b298b53d90702aef25ce44254efc1e7b21c0e767702c91cbfa3b1876a4c32980f80dd34eaf40453d76d093635df17818f663c9c
 EBUILD dropbox-94.4.384.ebuild 2561 BLAKE2B 9c6df8557694385a3817b26c068731524c3cfd72b8fc6514be8fd1646ee1c7073a101cc24e82f5dae9bc16fdb2cebcdad621d8d9a963aaa486659b2adc32b7ec SHA512 5de8951c0dfb17269b659ed76fc3260c93e1c2c3ea91f3a1070cb7b2b02a15b252696ecf4d8223d1d3cc1f46df08d9ba2c365a177c4c9632e1a129c054428188
-EBUILD dropbox-95.4.441.ebuild 2563 BLAKE2B 4bfdeb547c2f0ac9e3d98d647c8d8178567780460463e029205309a946c1f46a6f89badf6916fff113ff6317cd5bafc7b311a8017d6f0203087f55baff939ef7 SHA512 eedc17753481143c2b258f8a8b1527394667120be4f88e6969c927207009ec14ffcdbd5b7e928924c009ddf19e2e76a8d7a613fa849897aec3a567719e8102a4
+EBUILD dropbox-96.4.172.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
+EBUILD dropbox-97.3.451.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
+EBUILD dropbox-97.4.467.ebuild 2548 BLAKE2B 0ab7a439a7f99d50ef8fa036807330510463895ac7498dcac125cc0fb35615fca328a228f0d69d291c182323c4777e6a4e69e7d7201315729df9cf84b0643008 SHA512 4231b7e3b24db00386a00e3c589f2889dbfe9fa4658c8d912e0b9c96de8b35061b588bfd985514928f97fa78f0a01b0b836f0c0e3d34577f5bff985c009bb1a8
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-95.4.441.ebuild b/net-misc/dropbox/dropbox-96.4.172.ebuild
index ff5503155916..38f892d3ba40 100644
--- a/net-misc/dropbox/dropbox-95.4.441.ebuild
+++ b/net-misc/dropbox/dropbox-96.4.172.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 	if use X ; then
 		mv images/hicolor/16x16/status "${T}" || die
 	else
-		rm -vrf PyQt5* *pyqt5* images || die
+		rm -vrf images || die
 	fi
 	if use librsync-bundled ; then
 		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
diff --git a/net-misc/dropbox/dropbox-97.3.451.ebuild b/net-misc/dropbox/dropbox-97.3.451.ebuild
new file mode 100644
index 000000000000..38f892d3ba40
--- /dev/null
+++ b/net-misc/dropbox/dropbox-97.3.451.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
diff --git a/net-misc/dropbox/dropbox-97.4.467.ebuild b/net-misc/dropbox/dropbox-97.4.467.ebuild
new file mode 100644
index 000000000000..38f892d3ba40
--- /dev/null
+++ b/net-misc/dropbox/dropbox-97.4.467.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 3f681e615880..8a7010fc950b 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1-r1.ebuild 705 BLAKE2B d6867f731cde532852a9c423058bd08feff493d8d9521903b3bbc728296396c563bda9265ef2535673b6f5c0d0045617d94ebe91a23a38be3b16aa9ae8df10f6 SHA512 1c0230063216607707e43e9e7f41e3a7ca5ac2f6dc9423143da5174a9f9b479b8abb418a376aa044083c6888fed3985a6d1f7afa5076bdf2d6dba28f7c495ea7
+EBUILD econnman-1.1-r1.ebuild 703 BLAKE2B 8341cd37890bc12d298d48d3a99600de6ccbdcd5c98e3e13876a98638dac3abedf630a65afb8bbc1c42505d963d2f1dc9652029f32691e0e6c8c49f77ca7d9ee SHA512 1f4b9720e992bc667ea4d7581224602653a1f9b527c5c89208e3fe2bc6f69c547aa371ac049739fec12aea1010267bf6c692b43acd6863266b0e87d7f7ce64b4
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r1.ebuild b/net-misc/econnman/econnman-1.1-r1.ebuild
index bf5b23bdf38b..6d4692fd9f99 100644
--- a/net-misc/econnman/econnman-1.1-r1.ebuild
+++ b/net-misc/econnman/econnman-1.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
index 2bcd4bffb22b..c80e6f54a45b 100644
--- a/net-misc/endlessh/Manifest
+++ b/net-misc/endlessh/Manifest
@@ -7,6 +7,6 @@ AUX logrotated-r1 181 BLAKE2B 6667824ccd09b277e1c020c68380061cc40f615b29dd5041fe
 DIST endlessh-1.0.tar.gz 12258 BLAKE2B add6e24568cc94b244aa52bb484d1516210bfaa5a82440e090a89a94d50fbd4805ae004f917af56a7ad82a6502ae97c059d3f1c24b7c3e13ad1bd5a04bcf1c3e SHA512 a7e4e6ac5dc5e9b6e479ac3323b6a3ecec398ea074970de7794c93bd7a1a77c5662bdfa5752217fe552db1b3dbb9f400183114d7399c5a019637cb40756b46a8
 DIST endlessh-1.1.tar.gz 12844 BLAKE2B 8828739844cb03f67067bb020c3da5b5c6610a195202776da1ae184c0ab02c9f2acef32cc6536bbb80a46242251e3425eed2c70b0d1a90b0e73696ac14babc94 SHA512 7df2463425ad1417a2e328eacfb840aed14727168b83b5adf80cf6c5c98a6fc05f96bba9257b543ef60202a74383e4978e92c4a1b959e35d4ab94e0e5bda14fd
 EBUILD endlessh-1.0.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
-EBUILD endlessh-1.1.ebuild 1276 BLAKE2B c08eb57ea3dedf5799c3f7e798ed19e615383d67a84b745326982a317435706c2487c5c077296e36ce3b9814bd45f271837cb894fabefbe58c039df2dc1163e2 SHA512 dbabc4140515ddcf131916f3e40e1cf6d046dd6ff9825e777b317611e9a02a52c7e977c969275931872486be9548efb9d2842ee49723f0c67f6ae59cc4bde9a3
+EBUILD endlessh-1.1.ebuild 1273 BLAKE2B 26818f880049315c57b94bc1609a80de6e36ced2c59bef26fe48cedeedfeca40287de5db60faf65eca27c90cc621d3ee75b566e8f1d6eb4936e1db7ff612fb94 SHA512 b0fc2fe1419ea01d66e3b672d48e5ad3cfe6b5a168b520412432677f67604ce5c2bce635e19369e79e8041d24d40b6aa7ff431db909f6c79589759241079a7c3
 EBUILD endlessh-9999.ebuild 1348 BLAKE2B 83ac47579e735b6b53e482feee08e0ca648556702e4b7cbd168d6ba08afc70d975ab8d1a062d42d1e15148286b5132ea994c9df61e80db3b337624b9b6ae2907 SHA512 820be32639fc61b2f04894f15dc33c76785662c5c162e7fff6b3280664992cf23c77e0239829d99e14efc88cff4d771656b548ebd69030d9e062631f68f2666a
 MISC metadata.xml 1031 BLAKE2B 8f3ec618c1142bbea8f7bc995b0630dedba8391b1b52045f24f3636418bdbdb3a9368e442b177915db8e77291af3c73bb2ee7ad7e3ad596916bcdfde14034ef2 SHA512 2cb9ee586abf06930aa03eb3a536c15d22114a5d3c42c15037cac9f6df6a289bdadcfd83b87f75869be49c22486c11c1e425f67bd982289be0f6130bfb828cbf
diff --git a/net-misc/endlessh/endlessh-1.1.ebuild b/net-misc/endlessh/endlessh-1.1.ebuild
index d4fc3553bf59..f79dee7a10e3 100644
--- a/net-misc/endlessh/endlessh-1.1.ebuild
+++ b/net-misc/endlessh/endlessh-1.1.ebuild
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
 else
 	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc64 x86"
 fi
 
 LICENSE="Unlicense"
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index 827dbe6695d0..fa2f68eae8e7 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -3,5 +3,5 @@ DIST exabgp-3.4.26.tar.gz 544456 BLAKE2B 75f62ce8a68588f711e86208f00cc6de9ae51a5
 DIST exabgp-4.0.10.tar.gz 2907852 BLAKE2B 2fad6c853aa7a6f136da3334df4b3bdcaaacd03d3fbf849510bcd40b0639bbcc521726797a196418f0ecd47047c65356ee047d30b009ee01b9d498e354ea3bfd SHA512 a21f49e5e99e28cc848cddfd3992dc18ba57d879d0964da0b906d16dca37aa05a00892d643d6cdeea80d4e629fc55a014d9bc50764d520fda77e94145297832e
 EBUILD exabgp-3.2.17.ebuild 435 BLAKE2B f9075fca0cc83f4ab693453fd434538fa72f7b7efe0f2702b9fd7fbc40fced273dac906be1d24fd2ebb58b350df862a95e0dd22859123703871546062e8f6806 SHA512 200dbcc99913a28bd69a7ebde17b729efb280fd1c79e7cd99196c1648f60f771ddac734dbd56d5c4ecc182fd00e9d9d7d89e7b46ed09e9c67bd9c35d544f8359
 EBUILD exabgp-3.4.26-r1.ebuild 400 BLAKE2B 0be76cb073e639dc6bc3a4dc61da8dd3da7c63c407af1af08c3e18a4d224ca87092f91d647dd3a8eecd1595680c0521898f7c378679c6816a430eb47422e01b6 SHA512 50fc08f265c6f5025426257d4ad5c6039137450654a2cc9116c29d61c6f07a16379be4adfb6b62f746bcfaa1e00e92b3b56ed2cde070df9e549a2807f89ad71b
-EBUILD exabgp-4.0.10.ebuild 402 BLAKE2B b297b469d107ee4f255e5af4a5ba408ae546548dd60ca9dcedb1b7671590083982d89515676f03efdf67ba3d00dd397ca57acb9bac8885638fd462b9e39668bb SHA512 af25d306a9b55c659b78ad629bd5cac55b183e2ed8976cb7abe8bf6477efc958a77f623bd5c9e46086e53d0b0ee6cbe03b6fcbcb2ade58af5f71c8180fc0dcdf
+EBUILD exabgp-4.0.10.ebuild 392 BLAKE2B bd1b2536cfafc2c240afa8ac33407837aa5116893dbad65aeba410d4abfa6178dc1c83939d9c1268348d5a3b3d55027202182fafc4eb0770e98457e982124202 SHA512 a280748ff18326e80b1495b62acb966ea2116cae379d1e68cb9df1d7af95174bd88cdd2a789d0af4c2d6deaa4ffb8309e057b073c3eb03165f7116b5aa4fc1e4
 MISC metadata.xml 339 BLAKE2B 863e3a5221b0dc3ef29b27b0d27a0941adc634d0287881bc586005ac6ed60e33e7a1dd48d63b237a78581b7a9890347a8ecc5346ad90cae732763235e486f8ae SHA512 81c99b9e586b1873b2949359be5147e2651e1b7a7e81aed124f54248f2c5f96ffe68f19f153d7029ec8a16e04b1a71b0c6c79c4c747d5901079a536d716acdc8
diff --git a/net-misc/exabgp/exabgp-4.0.10.ebuild b/net-misc/exabgp/exabgp-4.0.10.ebuild
index e55824effab4..3a13ef59ecf4 100644
--- a/net-misc/exabgp/exabgp-4.0.10.ebuild
+++ b/net-misc/exabgp/exabgp-4.0.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index ead6d510cbce..5424706184d1 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,13 +1,8 @@
 AUX 2.0.0-backports.patch 3717 BLAKE2B a80d2fd291f4a2c94253cc41b50610b0f6116181853fd8ca07c88b17c816156f69a168347633651b23bdd8e6d65e583e03d1f7f8e9d8d26e04daee34a165506e SHA512 e8fab560145ed73d28aaeb93cbf8ada68a76ab7ee3e0cbb9f65f157a935a1c312bc6e9c188e4bca83b1e64d00af93fa39b9ab0d1fdb558936aa2d2b0738155a5
-AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa1fb0dcc01189964e252fc2fa190f4dc05b13a20302bc5921c4c0344e732539a560c11fd5800d661a518d99fdec68698 SHA512 cdd2a6c3524e717d68d3f386d666cbf81e53e956b8f2a5ae1b37e89c32e334e847255f3a4b77cb4b4b9bbe7f831ec4fe2ce87d5a49b11d7a452affd7083de21a
-AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
-DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
-DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
 DIST freerdp-2.0.0.tar.gz 6857730 BLAKE2B 2873a228b82874d3efae3ea922c83c7d32692ae17da2b7b85a9dd570d8d3f4df7f4943920474cb6711c32c6e8863429a165a6f4b65c834fda1320bcb804b38db SHA512 4babb7b3a5e7b39b89c4e1dbcd5a58b5fbfb8d48083dbafc2c6455d8b739f4c444715286cc10f2f7446f96053d3f5ff4ac2cff1af9708cbc48ef07a6fee5bee6
-DIST freerdp-2.0.0_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
-EBUILD freerdp-2.0.0-r1.ebuild 2997 BLAKE2B 829a78f5c867887c4c74365fc8702c5565d90a5b6f6e6c6e5bde7396030985cd872a9f0fbcf2e511dd6f843494bbda2e12fe1babd69fa4712806425dff3c74c2 SHA512 339f88691209d639011948c76a2fcc37fc3104d54844ae45a53b8e85d3eefd2223a434256a5ca7b82b2b87577d9200e92e82cf511406c59ffe2665c5fe290405
-EBUILD freerdp-2.0.0_rc4.ebuild 3001 BLAKE2B 3074b0d8955c16bc10ddf54260125d66040fbca0cd286dca22e80b2e5cab5e7600db17d26440ab707bd0edc7e498da7745c0bb2a4744ac21e31d7904edda1e3f SHA512 143047ed46be75abd18927a8e10e15c2da8d3fa2b6cb1ad92dbfb33753c62617788f8cc8386f285f9aba703c60fb0cdc1e3b08848e5ebb6f8b2d336b21a29744
-EBUILD freerdp-2.0.0_rc4_p1129.ebuild 3026 BLAKE2B 52ef38105384c0ac40f4a83db2d01ee4bc5d06f34fbd26336a93ea5f96bc4c9b522d31f3c60efe2d3146c1aaa51919f905e3a29ebdddee3191cb53edc0f68fce SHA512 cd483f12fb1b591c2648f09b056c0b380d63e0fa31b59d309ab2bb2abf57de654fe31313719bfb35380e3146faf63553a7adf01c296bd07f2c1451f1eaed54ac
-EBUILD freerdp-2.9999.ebuild 3009 BLAKE2B 2a407e5ebe84252070783daf9d5564da0486fa59bae44734ed7dbc588648ce00076c07eadb7ea24d66ff7130b4c323367e40f4d38a9448ab917eaaeadf4a9344 SHA512 3cd0b4bcaf687072b70a3803931b0960a7869e815f7261b3e1d9aede0595ab9362cf40edf6c00fc786d8f37d0d9bdead4ec235fa149645a0e43217ba0188a3a0
-EBUILD freerdp-9999.ebuild 3009 BLAKE2B 2a407e5ebe84252070783daf9d5564da0486fa59bae44734ed7dbc588648ce00076c07eadb7ea24d66ff7130b4c323367e40f4d38a9448ab917eaaeadf4a9344 SHA512 3cd0b4bcaf687072b70a3803931b0960a7869e815f7261b3e1d9aede0595ab9362cf40edf6c00fc786d8f37d0d9bdead4ec235fa149645a0e43217ba0188a3a0
+DIST freerdp-2.1.0.tar.gz 21772624 BLAKE2B d3491cb9f08a34fd5b2a5b00b46494e4e0524715d73ad46e92812578fbe9843504d937dc634f1597a7f0785494fd2c68f964125b438328105e4db41191eeb166 SHA512 c0abecf3d52bf8388538f0bb60a0852b6f92c9172feda06efa96eb49a354913c7a10b9852efb0de6e545658043d0d3568cb79a54fc1d324a14e8ed2c9c9e6e3b
+EBUILD freerdp-2.0.0-r1.ebuild 2942 BLAKE2B 0f2aa9737cfd68caf4012beb385e25ac6464fc067eb40ebeb2f3c2196183c192cb85f1d92e2947f1a5555d9d280d68e8b960dd9bbc50105472003df97c62f758 SHA512 0a4e542307b57033c840d8e0b2c59b2befae7dc732e82f58e4af13fe56088efe01459f09315487e53d3c0aea55cde722a13e4e44efd804de19a8b5fc3b69c692
+EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
+EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
+EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
deleted file mode 100644
index cd78ba983b7b..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Wed, 13 Feb 2019 09:30:34 +0100
-Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
-
----
- libfreerdp/codec/bitmap.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
-index 7524bb99ce..479c965e52 100644
---- a/libfreerdp/codec/bitmap.c
-+++ b/libfreerdp/codec/bitmap.c
-@@ -26,12 +26,14 @@
- 
- static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
- {
--	return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
-+	const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
-+	return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
- }
- 
- static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
- {
--	return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
-+	const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
-+	return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
- }
- 
- /*****************************************************************************/
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
deleted file mode 100644
index fd6e6148607a..000000000000
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 649f49fa61ca98a05b26c3b2a26a1c30ca24ea26 Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Thu, 22 Nov 2018 09:23:46 +0100
-Subject: [PATCH] Fix #5049: LibreSSL does not have SSL_CTX_set_security_level
-
----
- libfreerdp/crypto/tls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 20fde415d8..76f51701fe 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -656,7 +656,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
- #endif
- 
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- 	SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
- #endif
- 
-From effa8b8562d5e4b017570815c7e4d8faa0dd9a9e Mon Sep 17 00:00:00 2001
-From: akallabeth <akallabeth@posteo.net>
-Date: Thu, 22 Nov 2018 19:10:05 +0100
-Subject: [PATCH] Fix #5049: Libressl declares OPENSSL_VERSION_NUMBER too high
-
-Need to check specifically for LIBRESSL_VERSION_NUMBER as they
-set the version higher than OpenSSL 1.1 but without API support.
----
- libfreerdp/crypto/tls.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index 76f51701fe..ded41f127e 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -655,8 +655,7 @@ static BOOL tls_prepare(rdpTls* tls, BIO* underlying, SSL_METHOD* method,
- 	SSL_CTX_set_max_proto_version(tls->ctx, 0); /* highest supported version by library */
- #endif
- 
--
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- 	SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
- #endif
- 
-From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
-From: Armin Novak <armin.novak@thincast.com>
-Date: Mon, 7 Jan 2019 14:18:14 +0100
-Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
-
----
- libfreerdp/crypto/tls.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
-index b2cf5416c8..56e16bacb4 100644
---- a/libfreerdp/crypto/tls.c
-+++ b/libfreerdp/crypto/tls.c
-@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
- 	 * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
- 	 *        SSL struct is opaqe now
- 	 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
-+	(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
- 
- 	if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
- 	{
-@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
- 		if (tls->ssl->s3->wbuf.left == 0)
- 			tls->ssl->method->ssl_dispatch_alert(tls->ssl);
- 	}
--
- #endif
- 	return TRUE;
- }
diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
index 2ea42012517c..d4c577fb18e5 100644
--- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -45,10 +45,7 @@ RDEPEND="
 			xv? ( x11-libs/libXv )
 		)
 	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
deleted file mode 100644
index 5bd7f37650e6..000000000000
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-if [[ ${PV} != 9999 ]]; then
-	MY_P=${P/_/-}
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
-		https://github.com/FreeRDP/FreeRDP/commit/6931f54fad12eaf46a72c5c02ac05da817ab6b94.patch -> freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch"
-	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
-else
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib:0
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		x11-libs/libXrandr
-	)
-	jpeg? ( virtual/jpeg:0 )
-	openh264? ( media-libs/openh264 )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXrandr
-			x11-libs/libXtst
-			xinerama? ( x11-libs/libXinerama )
-		)
-	)
-	smartcard? ( sys-apps/pcsc-lite )
-	systemd? ( sys-apps/systemd:0= )
-	wayland? (
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxkbfile
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	client? ( X? ( doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	) ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/2.0.0-rc4-libressl.patch
-	"${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch
-	"${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DCHANNEL_URBDRC=$(usex usb)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_DEBUG_ALL=$(usex debug)
-		-DWITH_MANPAGES=$(usex doc)
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_DSP_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER_1_0=$(usex gstreamer)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_NEON=$(usex cpu_flags_arm_neon)
-		-DWITH_OPENH264=$(usex openh264)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_SERVER=$(usex server)
-		-DWITH_PCSC=$(usex smartcard)
-		-DWITH_LIBSYSTEMD=$(usex systemd)
-		-DWITH_X11=$(usex X)
-		-DWITH_XINERAMA=$(usex xinerama)
-		-DWITH_XV=$(usex xv)
-		-DWITH_WAYLAND=$(usex wayland)
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.1.0.ebuild
index 4ef50289d0b5..6f7e867eb817 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.0.ebuild
@@ -1,18 +1,21 @@
-# Copyright 2011-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake
 
-if [[ ${PV} != 9999 ]]; then
-	COMMIT="483d09b760bea529972afad9b6f6c7a89dcffd40"
-	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/FreeRDP-${COMMIT}"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -20,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -29,26 +32,21 @@ RDEPEND="
 	sys-libs/zlib:0
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
 	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
@@ -85,10 +83,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	client? ( X? ( doc? (
+	X? ( doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
-	) ) )
+	) )
 "
 
 src_configure() {
@@ -97,7 +95,6 @@ src_configure() {
 		-DCHANNEL_URBDRC=$(usex usb ON OFF)
 		-DWITH_ALSA=$(usex alsa ON OFF)
 		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
 		-DWITH_CUPS=$(usex cups ON OFF)
 		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
 		-DWITH_MANPAGES=$(usex doc ON OFF)
diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
index 48ee51c92773..fa7d73ce5c84 100644
--- a/net-misc/freerdp/freerdp-2.9999.ebuild
+++ b/net-misc/freerdp/freerdp-2.9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,26 +32,21 @@ RDEPEND="
 	sys-libs/zlib:0
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
 	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
@@ -88,10 +83,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	client? ( X? ( doc? (
+	X? ( doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
-	) ) )
+	) )
 "
 
 src_configure() {
@@ -100,7 +95,6 @@ src_configure() {
 		-DCHANNEL_URBDRC=$(usex usb ON OFF)
 		-DWITH_ALSA=$(usex alsa ON OFF)
 		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
 		-DWITH_CUPS=$(usex cups ON OFF)
 		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
 		-DWITH_MANPAGES=$(usex doc ON OFF)
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 48ee51c92773..fa7d73ce5c84 100644
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -32,26 +32,21 @@ RDEPEND="
 	sys-libs/zlib:0
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
-	client? (
-		usb? (
-			virtual/libudev:0=
-			sys-apps/util-linux:0=
-			dev-libs/dbus-glib:0=
-			virtual/libusb:1=
-		)
-		X? (
-			x11-libs/libXcursor
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
-			xv? ( x11-libs/libXv )
-		)
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
 	)
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
 	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	!ffmpeg? (
 		x11-libs/cairo:0=
 	)
@@ -88,10 +83,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	client? ( X? ( doc? (
+	X? ( doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/xmlto
-	) ) )
+	) )
 "
 
 src_configure() {
@@ -100,7 +95,6 @@ src_configure() {
 		-DCHANNEL_URBDRC=$(usex usb ON OFF)
 		-DWITH_ALSA=$(usex alsa ON OFF)
 		-DWITH_CCACHE=OFF
-		-DWITH_CLIENT=$(usex client ON OFF)
 		-DWITH_CUPS=$(usex cups ON OFF)
 		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
 		-DWITH_MANPAGES=$(usex doc ON OFF)
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 7da60898e7a7..e55f6ea5329a 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -3,10 +3,46 @@ DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c4
 DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3f4ee5cea873f2fd3fbcbe7a38f22d2995558f8196f4c4030fb6f24b179104912af3290d3b7ed9bde9fbe5ff37862c SHA512 24e6a9f72449df1a2763314f188828332b5516962dbd75892689e505516af967bece60cc846fe17cfcc1ddb4d6111c9cd7d5c0ebc9d3e8e7af355f8a1c7f1a2f
 DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
 DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c
+DIST geoipupdate-4.3.0.tar.gz 28170 BLAKE2B 4a7cf9820a37b063665cd0494003fedd4b8a9835dc0746477f28287ccee619efe07c7af608ccb04293b817151fbe409f24c828a0c5f2bd4d60f8570b4df8d4f7 SHA512 2cc40ef436b67e114e854230c439778a139adb05c766e8fdaf70269c23bee4cecee35d5b1a0b12ce9b70185e28231eb97486120fbd2900b8f61c2e6ce6601ad3
 DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
+DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 11234 BLAKE2B d806e8bf8671c1e1adf0dc95ea61efdba9a53ffd1e4b2cdd469030964c7137a51cc77ed65b2788ff4a692ab6ca46572f30e20b6b8c7887eb304c07d8f835fadc SHA512 bacd8f76999947d61c25839c38fa102b4cd7c2998573727309032db6ea47019147f51d2c03d38744e739b2e26afe0ad49c330e936649ad848d332ab1d04c3bca
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
+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%2Fmaxmind%2Fgeoipupdate%2F@v%2Fv4.0.2+incompatible.zip 32231 BLAKE2B ebccf1282f99c7b889969d9a11be3aa98d662adb463ede02bc4ff2e2db757be5a9187f6ff0568ed08fde2438d2f66974972f25128ff252a4bafafef786448091 SHA512 46dc6e891a4bcd57ffae0777ac4c3b9bcebbb8d8a661704d9fada707221ad9fe9b37fe0a053824e4ee362a0fc4cd625e0379c4522f5526dd1353beffb62149e4
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.0.zip 18663 BLAKE2B ccec7bae555b0c549b5da7d2ca1a16d261721473c638aafee7bd80a1be86b3a377654e32bbcad0c040186767b2f3f92017c0df47f7b86a0c926aabfdbf708450 SHA512 13d7c1acdffefb28bdd1c9efdaa579cf94d02a187e1952fe5da1cccb4934c34329792776fa46e801b43fee8df15c3f9dcd0a7a3fe85b78942dcbafca6e106b7b
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
+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.5.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+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
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+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.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
+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 geoipupdate-2.3.1.ebuild 556 BLAKE2B bae302dc72232794f36938ba7a45e5c7944f32cc67dcd5745b1fa5331b81b43421c1e54a92d5aef50c3223c78b2c4ae0f74a0f774238361135d9db337e96628e SHA512 fa8adad5260a646ce0f0e134b96f7e4dbfc202e7a9e930672cf7ee82adfdf06c262540eef34863c14e7ccf241986442a48bcdbfdc9d76b97c6c9bb0c204f09a8
 EBUILD geoipupdate-3.1.0.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-3.1.1.ebuild 563 BLAKE2B ed99758c1c0b3ee9053267444573ac3ae08d646d0a99f4ff9e6f43fa358451126b14474b9d4f233808a6ab44d9e7508db123cc3e4177fd27ad5c07c6ac0f1059 SHA512 36fcff88023b5f46c5528fa30b157fab5a159975ff1c4dbb1d1b69c48a3290c2416aceee3f1ea17b8e447a6524045a6af18646062454b3d80e0924934e4fadd7
 EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
+EBUILD geoipupdate-4.3.0.ebuild 2779 BLAKE2B d3ddab0b40e634f1ccc6708bd456bd79187750a675b88ba9bbbcb7f3e5f2ac305d29b18bb42c5458158e3cba9338f3323754542892768b097a95fbf703028328 SHA512 7a668cf18e79b85766a9e418fd688dd0040a68ace4c8af8dbc0256865245156ab1cd55eb66cd2b3665ae9d7a777fccc2149a3042f3f8378be2fdb374b50cd266
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
new file mode 100644
index 000000000000..7b41992866ca
--- /dev/null
+++ b/net-misc/geoipupdate/geoipupdate-4.3.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/maxmind/${PN}"
+
+inherit eutils go-module
+
+DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
+EGO_SUM=(
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1" # SPDX:ISC
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/gofrs/flock v0.7.1" # SPDX:BSD-3-Clause
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/kr/pretty v0.2.0" # SPDX:MIT
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0" # SPDX:MIT
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/maxmind/geoipupdate v4.0.2+incompatible" # SPDX:MIT, SPDX:Apache
+	"github.com/pkg/errors v0.9.0" # SPDX:BSD-2-Clause
+	"github.com/pkg/errors v0.9.0/go.mod"
+	"github.com/pkg/errors v0.9.1" # SPDX:BSD-2-Clause
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0" # SPDX:BSD-3-Clause
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.5" # SPDX:BSD-3-Clause
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/stretchr/objx v0.1.0" # SPDX:MIT
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.4.0" # SPDX:MIT
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.0" # SPDX:MIT
+	"github.com/stretchr/testify v1.5.0/go.mod"
+	"github.com/stretchr/testify v1.5.1" # SPDX:MIT
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" # SPDX:BSD-2-Clause
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2" # SPDX:Apache-2.0, SPDX:MIT
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7" # SPDX:Apache-2.0, SPDX:MIT
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+)
+go-module_set_globals
+SRC_URI="
+	https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="ISC BSD BSD-2 MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md CHANGELOG.md doc/GeoIP.conf.md doc/geoipupdate.md )
+
+# Do not let these leak from outside into the package
+export GOBIN= GOPATH= GOCODE=
+
+src_compile() {
+	# requires pandoc but the information is still in the distributed md files
+	sed -i -e '/GeoIP.conf.5 /d' -e '/geoipupdate.1$/d' Makefile || die
+	#sed -i -e 's/go build/go build -x/' Makefile || die
+
+	# the horror, the horror ... but it's all automagic
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
+	default
+}
+
+src_install() {
+	dobin build/geoipupdate
+	keepdir /usr/share/GeoIP
+	insinto /etc
+	doins build/GeoIP.conf
+	einstalldocs
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 8550ce9ffe4e..ca04ef01fcae 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1,8 +1,10 @@
 AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e91b9e542e3e9ac0bd51992c6c024ead3c9643e067430eefec9305ea3e8c9c4592a254da518baead245fe SHA512 7e02ce95ab75665c75463a07255a23832a6392a073c432304fc971eaf3a338c401e6f6d706798301b813c24bee2c4a5cbb0ab6cd13b73f6c7f60d0b2a99a0931
-AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 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.4.0.tar.gz 2896853 BLAKE2B 52271c67170a1dd20a35959dd24f52bdef1fbb4653ecf8b77e9b2aea6c7943249bc4c7c633312129e8318fd7d249c8513f2f808b68309518d5ba78cc8e3569e5 SHA512 989716bc60bc7e171448e18aff58d8f17dbbed28ca31cfeaa7dc0e6f1cb646da88041deff6481e15ba398090a01f07e00f74b12e84c423b7ca5b82eb97b918cd
-EBUILD gerbera-1.4.0.ebuild 2347 BLAKE2B a04cbd102d80127f538ee7701de893860c432a2be5e0ff2d4f3aced9aea3dffae4d10db1f4cebf03ff9901db70260ec0c1755d8214286d66d7d0cadc2c19397f SHA512 cc8b3b0d2fdeed63773847ed1a6a030d55f5f5351086e020dd6f86e6984fac5334e0ff70dd80b4b993aef7f26b806e2420b352485680a2c3741680f9f56f0e1c
-EBUILD gerbera-9999.ebuild 2347 BLAKE2B a04cbd102d80127f538ee7701de893860c432a2be5e0ff2d4f3aced9aea3dffae4d10db1f4cebf03ff9901db70260ec0c1755d8214286d66d7d0cadc2c19397f SHA512 cc8b3b0d2fdeed63773847ed1a6a030d55f5f5351086e020dd6f86e6984fac5334e0ff70dd80b4b993aef7f26b806e2420b352485680a2c3741680f9f56f0e1c
+DIST gerbera-1.5.0.tar.gz 2876447 BLAKE2B afd619d22dd3c4455dae5926e964ecd2e5cb65bf4d0e2bd537b95139029163291a3967c1a1237d9c0d09ad45c5e58edf9e1f904755a488e0ef8b094f59e52b70 SHA512 dec7b329691cef53b99a591e3c49b24d92e52ee23c1cbaf370b61360716031dfc0552b88f07d1691f4b3a6b268e3edc3d56e6ef07a98e59053486970d9aa5c96
+EBUILD gerbera-1.4.0-r1.ebuild 2285 BLAKE2B 87c3342dddc9931f53654b2c948187472110628b0d49fc936908b44d7e4276b8a74dbba2b387b6f8ec9679f12fb69b1b20b55e55296a825e05c07566694271df SHA512 326481ecaadb0e04da9bbbb2e428bb19fbd45b15f4f040c89ca86f9ddb0756b0132a0b1cc670d4d0f6a42e8df55f0fab0ff6698dbcb38c23621910781ef497d2
+EBUILD gerbera-1.5.0.ebuild 2374 BLAKE2B 0fc28c9d35b1c615a5880b9ecb19cd5d62a7024f2c07069bf1cca20cb79313b1ad0b03e12184f6310ed51cf03cbdddf41e877c263888b15960cf74727fbd4473 SHA512 d0ef6b689356d05365ce0e9e5046f1bc10173b8c8a56d6edee1bd84e6596fb063cf1bfeed2c07060de867efc7f24ce665e5ef61620f21da0b34b3d4e1dfa5ce7
+EBUILD gerbera-9999.ebuild 2309 BLAKE2B af7060d2acf0d50fb86c0a292e578a58be1971b189010b338047bf80b31e3cba3cf5fbe1ea69a6feb063bb1a00c9f5415e0096e44b83ba4cd32b08896f180a9f SHA512 236756bf69dc2f82b99d0297e142f99304e0798bb4f961caea1e2bd35317319ee4c20e43b6075ff0842b01d54d57f6c587c9a43277cc78d3053761b507a45b48
 MISC metadata.xml 1074 BLAKE2B 35bccb59d384c80ef6a3a62e9e2e68a9be6e559c3573fc4d7b342b775aff91b969e9fb15b23fe106b467e4f78f0e1771ae2bda7a7bb23d0ea2fab0f19beb2c99 SHA512 b3abb9ac765a6c770134f6ade055786c50d7af8e2d051a638dcec412963d876a7273d7531a3a26491cca9e3bb93a1842952fd9de0f76adc60de0747fd8182f09
diff --git a/net-misc/gerbera/files/gerbera-1.0.0.config b/net-misc/gerbera/files/gerbera-1.0.0.config
deleted file mode 100644
index 94bdb936e145..000000000000
--- a/net-misc/gerbera/files/gerbera-1.0.0.config
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config version="2" xmlns="http://mediatomb.cc/config/2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/2 http://mediatomb.cc/config/2.xsd">
-  <server>
-    <ui enabled="yes" show-tooltips="yes">
-      <accounts enabled="no" session-timeout="30">
-        <account user="gerbera" password="mediatomb"/>
-      </accounts>
-    </ui>
-    <name>Gerbera</name>
-    <udn></udn>
-    <home>/var/lib/gerbera</home>
-    <webroot>/usr/share/gerbera/web</webroot>
-    <storage>
-      <sqlite3 enabled="yes">
-        <database-file>gerbera.db</database-file>
-      </sqlite3>
-      <mysql enabled="no">
-        <host>host</host>
-        <database>database</database>
-        <username>username</username>
-        <password>password</password>
-      </mysql>
-    </storage>
-    <protocolInfo extend="yes"/>
-    <pc-directory upnp-hide="no"/>
-    <extended-runtime-options>
-      <ffmpegthumbnailer enabled="no">
-        <thumbnail-size>160</thumbnail-size>
-        <seek-percentage>10</seek-percentage>
-        <filmstrip-overlay>no</filmstrip-overlay>
-        <workaround-bugs>no</workaround-bugs>
-        <image-quality>8</image-quality>
-      </ffmpegthumbnailer>
-      <mark-played-items enabled="no" suppress-cds-updates="yes">
-        <string mode="prepend">*</string>
-        <mark>
-          <content>video</content>
-        </mark>
-      </mark-played-items>
-      <lastfm enabled="no">
-        <username>username</username>
-        <password>password</password>
-      </lastfm>
-    </extended-runtime-options>
-  </server>
-  <import hidden-files="no">
-    <scripting script-charset="UTF-8">
-      <common-script>/usr/share/gerbera/js/common.js</common-script>
-      <playlist-script>/usr/share/gerbera/js/playlists.js</playlist-script>
-      <virtual-layout type="builtin">
-        <import-script>/usr/share/gerbera/js/import.js</import-script>
-      </virtual-layout>
-    </scripting>
-    <mappings>
-      <extension-mimetype ignore-unknown="no">
-        <map from="mp3" to="audio/mpeg"/>
-        <map from="ogx" to="application/ogg"/>
-        <map from="ogv" to="video/ogg"/>
-        <map from="oga" to="audio/ogg"/>
-        <map from="ogg" to="audio/ogg"/>
-        <map from="ogm" to="video/ogg"/>
-        <map from="asf" to="video/x-ms-asf"/>
-        <map from="asx" to="video/x-ms-asf"/>
-        <map from="wma" to="audio/x-ms-wma"/>
-        <map from="wax" to="audio/x-ms-wax"/>
-        <map from="wmv" to="video/x-ms-wmv"/>
-        <map from="wvx" to="video/x-ms-wvx"/>
-        <map from="wm" to="video/x-ms-wm"/>
-        <map from="wmx" to="video/x-ms-wmx"/>
-        <map from="m3u" to="audio/x-mpegurl"/>
-        <map from="pls" to="audio/x-scpls"/>
-        <map from="flv" to="video/x-flv"/>
-        <map from="mkv" to="video/x-matroska"/>
-        <map from="mka" to="audio/x-matroska"/>
-        <map from="avi" to="video/divx"/>
-        <map from="m2ts" to="video/avc"/>
-        <map from="cr2" to="image/raw"/>
-        <map from="nef" to="image/raw"/>
-      </extension-mimetype>
-      <mimetype-upnpclass>
-        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
-        <map from="video/*" to="object.item.videoItem"/>
-        <map from="image/*" to="object.item.imageItem"/>
-      </mimetype-upnpclass>
-      <mimetype-contenttype>
-        <treat mimetype="audio/mpeg" as="mp3"/>
-        <treat mimetype="application/ogg" as="ogg"/>
-        <treat mimetype="video/ogg" as="ogg"/>
-        <treat mimetype="audio/ogg" as="ogg"/>
-        <treat mimetype="audio/x-flac" as="flac"/>
-        <treat mimetype="image/jpeg" as="jpg"/>
-        <treat mimetype="audio/x-mpegurl" as="playlist"/>
-        <treat mimetype="audio/x-scpls" as="playlist"/>
-        <treat mimetype="audio/x-wav" as="pcm"/>
-        <treat mimetype="audio/L16" as="pcm"/>
-        <treat mimetype="video/x-msvideo" as="avi"/>
-        <treat mimetype="video/mp4" as="mp4"/>
-        <treat mimetype="audio/mp4" as="mp4"/>
-        <treat mimetype="video/divx" as="avi"/>
-      </mimetype-contenttype>
-    </mappings>
-    <online-content>
-      <YouTube enabled="no" refresh="28800" update-at-start="yes" purge-after="604800" racy-content="exclude" format="mp4" hd="no">
-        <favorites user="NationalGeographic"/>
-        <playlists user="PlayStation"/>
-        <uploads user="Google"/>
-        <standardfeed feed="most_viewed" time-range="today"/>
-        <standardfeed feed="recently_featured" time-range="today"/>
-      </YouTube>
-    </online-content>
-  </import>
-  <transcoding enabled="no">
-    <mimetype-profile-mappings>
-      <transcode mimetype="audio/ogg" using="audio2pcm"/>
-      <transcode mimetype="audio/x-flac" using="audio2pcm"/>
-      <transcode mimetype="video/ogg" using="video2mpeg"/>
-      <transcode mimetype="video/x-flv" using="video2mpeg"/>
-    </mimetype-profile-mappings>
-    <profiles>
-      <profile name="audio2pcm" enabled="yes" type="external">
-        <mimetype>audio/L16</mimetype>
-        <accept-url>no</accept-url>
-        <first-resource>yes</first-resource>
-        <hide-original-resource>yes</hide-original-resource>
-        <accept-ogg-theora>no</accept-ogg-theora>
-        <sample-frequency>44100</sample-frequency>
-        <audio-channels>2</audio-channels>
-        <agent command="ffmpeg" arguments="-i %in -acodec pcm_s16be -ab 192k -ar 44100 -ac 2 -f s16be -y %out"/>
-        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
-      </profile>
-      <profile name="video2mpeg" enabled="yes" type="external">
-        <mimetype>video/mpeg</mimetype>
-        <accept-url>no</accept-url>
-        <first-resource>yes</first-resource>
-        <hide-original-resource>yes</hide-original-resource>
-        <accept-ogg-theora>yes</accept-ogg-theora>
-        <sample-frequency>48000</sample-frequency>
-        <audio-channels>2</audio-channels>
-        <agent command="ffmpeg" arguments="-i %in -vcodec mpeg2video -b 4096k -r 25 -acodec mp2 -ab 192k -ar 48000 -ac 2 -async 1 -f dvd -threads 2 -y %out"/>
-        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
-      </profile>
-    </profiles>
-  </transcoding>
-</config>
diff --git a/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
new file mode 100644
index 000000000000..93fd9e198dfb
--- /dev/null
+++ b/net-misc/gerbera/files/gerbera-1.5.0-incomplete-type-iohandler.patch
@@ -0,0 +1,25 @@
+From 5ebc80d64bc651a3cd5de0e92f1e607b8f8ea407 Mon Sep 17 00:00:00 2001
+From: Ian Whyman <ian@gerbera.io>
+Date: Sat, 9 May 2020 11:22:47 +0100
+Subject: [PATCH] Fix incomplete type iohandler with Ninja generator
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+error: invalid application of ‘sizeof’ to incomplete type ‘IOHandler’
+---
+ src/metadata/ffmpeg_handler.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/metadata/ffmpeg_handler.h b/src/metadata/ffmpeg_handler.h
+index 7c134430..565ff773 100644
+--- a/src/metadata/ffmpeg_handler.h
++++ b/src/metadata/ffmpeg_handler.h
+@@ -42,6 +42,7 @@
+ namespace fs = std::filesystem;
+ 
+ #include "metadata_handler.h"
++#include "iohandler/io_handler.h"
+ 
+ // forward declaration
+ class AVFormatContext;
diff --git a/net-misc/gerbera/gerbera-1.4.0.ebuild b/net-misc/gerbera/gerbera-1.4.0-r1.ebuild
index 122b20de3f69..f639025a6dc0 100644
--- a/net-misc/gerbera/gerbera-1.4.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.4.0-r1.ebuild
@@ -21,11 +21,11 @@ HOMEPAGE="https://gerbera.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
 DEPEND="
 	acct-user/gerbera
-	>=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+	=net-libs/libupnp-1.8*:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
 	mysql? ( dev-db/mysql-connector-c )
@@ -34,10 +34,7 @@ DEPEND="
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
 	curl? ( net-misc/curl net-misc/youtube-dl )
 	magic? ( sys-apps/file )
diff --git a/net-misc/gerbera/gerbera-1.5.0.ebuild b/net-misc/gerbera/gerbera-1.5.0.ebuild
new file mode 100644
index 000000000000..3e0553c702d6
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.5.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake eutils linux-info systemd tmpfiles
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server"
+HOMEPAGE="https://gerbera.io"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
+
+DEPEND="
+	acct-user/gerbera
+	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/spdlog
+	dev-libs/pugixml
+	dev-libs/libfmt:0/6
+	mysql? ( dev-db/mysql-connector-c )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
+	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl )
+	magic? ( sys-apps/file )
+	matroska? ( media-libs/libmatroska )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+PATCHES=(
+	"${FILESDIR}/${P}-incomplete-type-iohandler.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_DEBUG="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MATROSKA="$(usex matroska)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 122b20de3f69..adb30342a7ad 100644
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -21,27 +21,26 @@ HOMEPAGE="https://gerbera.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
 DEPEND="
 	acct-user/gerbera
-	>=net-libs/libupnp-1.8.3:=[ipv6,reuseaddr]
+	>=net-libs/libupnp-1.12.1:=[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
-	dev-libs/expat
+	dev-libs/spdlog
+	dev-libs/pugixml
+	dev-libs/libfmt:0/6
 	mysql? ( dev-db/mysql-connector-c )
 	javascript? ( dev-lang/duktape )
 	taglib? ( >=media-libs/taglib-1.11 )
 	lastfm? ( >=media-libs/lastfmlib-0.4 )
 	exif? ( media-libs/libexif )
 	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
+	ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
 	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl net-misc/youtube-dl )
+	curl? ( net-misc/curl )
 	magic? ( sys-apps/file )
-	matroska? (	media-libs/libmatroska )
+	matroska? ( media-libs/libmatroska )
 	sys-apps/util-linux
 	sys-libs/zlib
 	virtual/libiconv
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 9909b43e2fee..b5fa900144d9 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-miners-3.30.0.tar.xz 273700 BLAKE2B 146777d6fcdbb2e17ca360e515de6f373bf74063240c579a1e39c0083aad9b0d908754c78046713b027b1b062cf279e0dbe58d211d0341a0179b1d179aa77a2b SHA512 de1d9281978b985d777c1b4900128c6a3b83ef9d0c905b4441f9683a6a03de992ce921e8094d43b903e8547436db51aced91d93bd0cf74f7a385a1d5a5e8b726
 DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464
-EBUILD gnome-online-miners-3.30.0.ebuild 897 BLAKE2B 0d9cf3a45e2401db5562ef0a6ded32827b94a2dae4e536f66404f8c3b8424ca2bfa5e5ae2ab94ac1a5fc3e92faa9ef7abdd0112eccce2564d1c8b8d2a4b03565 SHA512 ed9665197a123f060c7647772f099f64aa997711abe82e86a8e018fbcbc87895df2f6ec6349d8317fda112fd9b96b5a7ab8c5c083390cedc37bcf6800ac793c5
 EBUILD gnome-online-miners-3.34.0.ebuild 897 BLAKE2B 2189a23b07210b50b5b3979dc36c58b5146c82254705276df0b0e458751ccaccfa124fde137834d16074a19e405df73fe38204f18ef2cc84869568e035d00fe9 SHA512 5bca8617485b11535b8f9185aa800cd8afe84b4cdcf7ec1aeb9cec5fccb2b5af723a70cac0a99b83de5861311a8b2aa03bfc593cdb8d3ef740897f87ef62f0ff
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild
deleted file mode 100644
index 9b40c6e51a53..000000000000
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Crawls through your online content"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="flickr"
-KEYWORDS="amd64 ~arm64 x86"
-
-# libgdata[gnome] needed for goa support
-RDEPEND="
-	>=app-misc/tracker-2:=
-	>=dev-libs/glib-2.35.1:2
-	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
-	media-libs/grilo:0.3
-	>=net-libs/gnome-online-accounts-3.13.3:=
-	>=net-libs/libgfbgraph-0.2.2:0.2
-	>=net-libs/libzapojit-0.0.2
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable flickr) \
-		--disable-static \
-		--enable-facebook \
-		--enable-google \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live
-}
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index eaabd9ccbebe..f5d2b9a260e6 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,9 +1,13 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
+AUX gsutil-4.50-boto-tests.patch 1483 BLAKE2B 9d40250f7a836535297da411bda76430dc844128f68f67d2817c6ffd2189b6cd5e40357ed15580f5bdd68a68148faf77c49198040e767af4c57f49163c5903f0 SHA512 53c20d01d60be0d560c5e15f26bbe206bba59ad97df486b8c24409e2a58b13093b09a4601f6d8add9ec4f5f01faf9e5c3ecee00e9818e5de84f7df7d39b5127a
+AUX gsutil-4.50-tests.patch 2451 BLAKE2B d84d1cd31eeabb3c0ecbb4b4850ec30d5f96e641b135b6c7fe6e7442edcfc4d2d076858b6fe1365f9424d32c81d9b818885df03f66405dfb8ca4d2149ee33ab5 SHA512 007e07b54a5f4182586f3defbc070f5883356214cb0e28861df66509c414d8bbde5718fd8598bcf023e9971331a34b2f1aefd89350e6d3c97e93ae80176b2d5a
 DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
 DIST gsutil_4.45.tar.gz 3695514 BLAKE2B 9b129ae1e87620b2430368818929fbd884319cd2cf7788275ba556f873b13700b9333c59b753202d8c88a81eaa47e223f39f6ded26adf8d16144324763528886 SHA512 9b21162afcfcd063976be51151d1d51aaeac1a32c2b7d0ee79aaccb28f5202f93623b39ed994bd796ab508a56363fea69429fe42cd770cff3c7c8352a4956212
 DIST gsutil_4.47.tar.gz 3696516 BLAKE2B c3a5e132ffff7b0e2e46cac17b1bd820b1ead63bbca4b80f17227290f25d12cb46e38df4334ffc71d0261f4467c157ed50ac21b25b1c7a58ec4113758c64d75b SHA512 66d150d496789a89acc71238c7554244ad17a8896b26fd7d6ffb6e26ce14c8b2268633f4a48b8abd8aa25b36f2ef4bd15cdde02b37a9ef52843200b0449289bb
+DIST gsutil_4.50.tar.gz 3618295 BLAKE2B bbd8ec13428a9822b1ebe3eea984f3e50abc010a0de4e57e7dc365642ab501f7994a235d778eaa73c8217ae1e69d1569e80ac8a59d94a84a6abb8272ad466a35 SHA512 aa7d68f369ac24c75cbd321d9a1a943fc361e9bf768797327852d0da39d364fa95ac3891367e90a39061b30b331405e2ea8358e0c91e3bdc5cb151d367e0857e
 EBUILD gsutil-4.41.ebuild 2603 BLAKE2B 6c8c12d7c3f8b5898822cf82f2851ed5f9d4e12fb046d160b7e4be73a61f7e1ee1ceadbde7198dfb071a15e63339b2994bc80ea18bf7b1de6bb7c2d7e6751b61 SHA512 d05a734bbc1962c6d09f5b8a9b47c55bec240f98b32d10acc01ade4ede0efea8b5737049983ad8bcb3f080a029763d6c58c1fa853bdc0cf054be572ebab6070d
 EBUILD gsutil-4.45.ebuild 2603 BLAKE2B 6c8c12d7c3f8b5898822cf82f2851ed5f9d4e12fb046d160b7e4be73a61f7e1ee1ceadbde7198dfb071a15e63339b2994bc80ea18bf7b1de6bb7c2d7e6751b61 SHA512 d05a734bbc1962c6d09f5b8a9b47c55bec240f98b32d10acc01ade4ede0efea8b5737049983ad8bcb3f080a029763d6c58c1fa853bdc0cf054be572ebab6070d
 EBUILD gsutil-4.47.ebuild 2785 BLAKE2B f7a409867898cb5cb41fcf39af6f0751ce2a5432b03312710cc151403872b9b9e5903938e90da91efd20c3d9a87b2cb34b6bbc059236ac8704cd28e2e82e5ba3 SHA512 3f6c2c3a9103d80665218d51c6ed8f1324a32e57a694e86d002aa41e720c2eab0b705b1611d7cc650f8c471d1abbb0515d68efe09b9c0bc08680953d92072139
+EBUILD gsutil-4.50.ebuild 3206 BLAKE2B 8f1f64a1f2da85e347e752f6f39944f80cc4e42888ce2f60f7888c42c8c19dc88bf563ebb14ed167af7a4a57c1ffb87a5fd92cfbebffb02d0f295cc1d0b4c9b8 SHA512 3f61634a22facae6470a40d3e4c5b9f19056c7221ee1c52211cb67b4180912344bda1e486286b8f80d2cdd642b2d1bd8712f1ebbc5c8933e7ada8f1623a8977b
 MISC metadata.xml 514 BLAKE2B b37a6acae57aa619dd2adc4722283fbf1f5076ed9b3fa18558fdbe0d9ea39eb9fd1e0a678ce2df59c2c37f444558f9e4d1e913be7c7fdf1b2a16f31e809b7588 SHA512 d97ecaa80d5996fb0bb424681861e552c4f3ee206ec0b5d7a4f703247ea495e0a201757ebe4a5288389cab58208ead2718288107cad173684f37ecb9357bf06e
diff --git a/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
new file mode 100644
index 000000000000..5a9b601604da
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.50-boto-tests.patch
@@ -0,0 +1,44 @@
+--- gsutil.orig/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-04-10 13:26:12.000000000 -0700
++++ gsutil/gslib/vendored/boto/tests/integration/s3/mock_storage_service.py	2020-05-07 11:11:14.971631528 -0700
+@@ -30,13 +30,11 @@
+ import boto
+ import base64
+ import re
+-import six
+ from hashlib import md5
+
+ from boto.utils import compute_md5
+ from boto.utils import find_matching_headers
+ from boto.utils import merge_headers_by_name
+-from boto.utils import write_to_fd
+ from boto.s3.prefix import Prefix
+-from boto.compat import six
++import six
+
+@@ -90,14 +88,12 @@
+                              torrent=NOT_IMPL,
+                              version_id=NOT_IMPL,
+                              res_download_handler=NOT_IMPL):
+-        data = six.ensure_binary(self.data)
+-        write_to_fd(fp, data)
++        fp.write(six.ensure_str(self.data, errors='replace'))
+
+     def get_file(self, fp, headers=NOT_IMPL, cb=NOT_IMPL, num_cb=NOT_IMPL,
+                  torrent=NOT_IMPL, version_id=NOT_IMPL,
+                  override_num_retries=NOT_IMPL):
+-        data = six.ensure_binary(self.data)
+-        write_to_fd(fp, data)
++        fp.write(self.data)
+
+     def _handle_headers(self, headers):
+         if not headers:
+@@ -284,9 +280,6 @@
+         else:
+             return '<Subresource/>'
+
+-    def get_tags(self):
+-      return []
+-
+     def new_key(self, key_name=None):
+         mock_key = MockKey(self, key_name)
+         self.keys[key_name] = mock_key
diff --git a/net-misc/gsutil/files/gsutil-4.50-tests.patch b/net-misc/gsutil/files/gsutil-4.50-tests.patch
new file mode 100644
index 000000000000..757f1f4ed4d5
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.50-tests.patch
@@ -0,0 +1,57 @@
+diff --git a/gslib/boto_translation.py b/gslib/boto_translation.py
+index 0af2e663..7d2f549f 100644
+--- a/gslib/boto_translation.py
++++ b/gslib/boto_translation.py
+@@ -1457,7 +1457,8 @@ class BotoTranslation(CloudApi):
+         # TODO: Define tags-related methods on storage_uri objects. In the
+         # meantime, we invoke the underlying bucket's methods directly.
+         try:
+-          boto_tags = bucket_uri.get_bucket().get_tags()
++          bucket = bucket_uri.get_bucket()
++          boto_tags = bucket.get_tags() if hasattr(bucket, 'get_tags') else []
+           cloud_api_bucket.labels = (
+               LabelTranslation.BotoTagsToMessage(boto_tags))
+         except boto.exception.StorageResponseError as e:
+diff --git a/gslib/tests/test_naming.py b/gslib/tests/test_naming.py
+index d91cda04..6b44719f 100644
+--- a/gslib/tests/test_naming.py
++++ b/gslib/tests/test_naming.py
+@@ -36,6 +36,7 @@ from __future__ import unicode_literals
+ 
+ import gzip
+ import os
++import unittest 
+ 
+ import six
+ 
+@@ -504,6 +505,7 @@ class GsutilNamingTests(testcase.GsUtilUnitTestCase):
+     self.assertEqual(1, len(actual))
+     self.assertEqual('/obj', actual[0].root_object.name)
+ 
++  @unittest.skip('test appears to be flakey')
+   def testCopyingCompressedFileToBucket(self):
+     """Tests copying one file with compression to a bucket."""
+     src_file = self.CreateTempFile(contents=b'plaintext', file_name='f2.txt')
+diff --git a/gslib/tests/testcase/unit_testcase.py b/gslib/tests/testcase/unit_testcase.py
+index b25352b6..c958f670 100644
+--- a/gslib/tests/testcase/unit_testcase.py
++++ b/gslib/tests/testcase/unit_testcase.py
+@@ -27,7 +27,6 @@ import tempfile
+ import six
+ 
+ import boto
+-from boto.utils import get_utf8able_str
+ from gslib import project_id
+ from gslib import wildcard_iterator
+ from gslib.boto_translation import BotoTranslation
+@@ -157,8 +156,8 @@ class GsUtilUnitTestCase(base.GsUtilTestCase):
+         stderr = sys.stderr.buffer.read()
+     [six.ensure_text(string) for string in self.accumulated_stderr]
+     [six.ensure_text(string) for string in self.accumulated_stdout]
+-    stdout = six.ensure_text(get_utf8able_str(stdout))
+-    stderr = six.ensure_text(get_utf8able_str(stderr))
++    stdout = six.ensure_text(six.ensure_str(stdout))
++    stderr = six.ensure_text(six.ensure_str(stderr))
+     stdout += ''.join(self.accumulated_stdout)
+     stderr += ''.join(self.accumulated_stderr)
+     _AttemptToCloseSysFd(sys.stdout)
diff --git a/net-misc/gsutil/gsutil-4.50.ebuild b/net-misc/gsutil/gsutil-4.50.ebuild
new file mode 100644
index 000000000000..99658a47144c
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.50.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.5[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-4.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/gsutil-4.41-tests.patch"
+	"${FILESDIR}/gsutil-4.50-boto-tests.patch"
+	"${FILESDIR}/gsutil-4.50-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# needs to talk to Google to run tests
+RESTRICT+=" test"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# NB: We don't delete all of boto/ because the tests are imported by the
+	# production code.  The same reason we can't delete gslib/tests/.  We can
+	# delete the main boto library and use the system version though.
+	rm -r gslib/vendored/boto/boto || die
+
+	# failes to compile with py3
+	rm gslib/vendored/boto/tests/mturk//cleanup_tests.py || die
+
+	sed -i \
+		-e 's/mock==/mock>=/' \
+		-e 's/oauth2client==/oauth2client>=/' \
+		-e 's/SocksiPy-branch==/PySocks>=/' \
+		setup.py || die
+	# Sanity check we didn't miss any updates.
+	grep '==' setup.py && die "Need to update version requirements"
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady
+	sed -i \
+		-e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		gslib/tests/test_cp.py || die
+
+	sed -i -E -e 's/(executable_prefix =).*/\1 [sys.executable]/' \
+		gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -i -e 's/sys.stderr.close()/#&/' \
+		gslib/tests/testcase/unit_testcase.py || die
+}
+
+python_compile() {
+	2to3 --write --nobackups --no-diffs -j "$(makeopts_jobs "${MAKEOPTS}" INF)" \
+		gslib/vendored/boto/tests || die "2to3 on boto tests failed"
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	BOTO_CONFIG="${FILESDIR}/dummy.boto" \
+		"${EPYTHON}" gslib/__main__.py test -u || die "tests failed with ${EPYTHON}"
+}
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index 8a8d1174c75d..a304e894513e 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,5 +1,3 @@
 DIST gupnp-tools-0.10.0.tar.xz 154792 BLAKE2B 47ef726fd931006ca8f63277269a729cda2d91fca7acb7f99c7c20020a3b75452b176dd7ad0c54aaf667da24db7f777d3fe6e8a2496127fe15e4d12912ddea6a SHA512 7fe9231a1ce9e1dea3d5d87df69dfb4014824ad286777cb7b5c93154df02c42e60e6aa239e34c4e0404d9a4a31c0172059110f7d004d7527b191bfa02ec552d7
-DIST gupnp-tools-0.8.14.tar.xz 558552 BLAKE2B a0f132722d14a1a0d35258ba2656e07e292c9ae1def256ff48e08d0526f3d665fe328464d5d836c5fb59936d592ed3cfc43c70870fbb88bfcdee74c3abe6f9e8 SHA512 746f12728c7d06d6fb2cab3f015c5d145ba8df45fb0ca8462a0d1c53db081f62ae7c39001604e73c2596f1584318680bf387a6f7751af7146b2b9c5c28651739
 EBUILD gupnp-tools-0.10.0.ebuild 704 BLAKE2B 6fd58af69cc9ea82fbdf59fd83e88aa5354a2042e564accb62fe848f2a3a832ba33c844e6bcf416cc4081d986c72ddeb5c4577d22f5c8841b4b705315a2af698 SHA512 1c045eaac96be3eaf5c04c4ea6a57688fab67dd55ce3110fca9f58f06e2dd5e3417655b5f9c2ccc79cea2dd29a61889c503c26dcd0aa1a7f91138486c841ca0d
-EBUILD gupnp-tools-0.8.14.ebuild 613 BLAKE2B 211dc9e0137a927737d12b120351ac79e2f76e7f7460337e2de025190b3894dd6e15a54bc1b9f36ee05925d95417f3e40db58c3e756f56df9b08ef9cae965c61 SHA512 d08cbc016f31c3a1da6fa246cd2608c0f4090a233ec72826cd7832fa1f9768d69e4977f08f958ed1a4a3a694643f02619eae463188c8f6b563242d00a69f8537
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
deleted file mode 100644
index a5798803860a..000000000000
--- a/net-misc/gupnp-tools/gupnp-tools-0.8.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit gnome2
-
-DESCRIPTION="Free replacements of Intel UPnP tools that use GUPnP"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.24:2
-	>=dev-libs/libxml2-2.4:2
-	>=net-libs/gssdp-0.13.3:0/3
-	>=net-libs/gupnp-0.20.14:0/4
-	>=net-libs/gupnp-av-0.5.5:0=
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/gtksourceview-3.2:3.0
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 15913a3df177..8e1d8394b142 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -6,5 +6,5 @@ DIST httpie-2.0.0.tar.gz 1752529 BLAKE2B 212e7a142f3efdf1bf238d6eb7e472579a8a824
 DIST httpie-2.1.0.tar.gz 1754801 BLAKE2B dabb6a1ce0cc4ecebbc7e933ed3084d7b75e0fac1fbf6968f41d37ee95cef684ee3603ddb5361e072328d13c9c98332b23bfdd0454da3399038307b124ea2e98 SHA512 39d56c9b9aad4871ce439a235377a930ad7c78b833f9bad568142efc9fd8af9123ac931e434c6ddb7fa6e0deb0acf8f5fd1ddf79f3b7a65467267cbf4629555b
 EBUILD httpie-1.0.3.ebuild 1280 BLAKE2B 8dc29d0ac813e1a560329dcaa81a7d09a9943ab7da68cdfd8fe51d78e5770b488cfaba540d37ba846a28a4dea2637f6f120e139ca77781ddf8b797024ca74c86 SHA512 7fcd9f49ed92db12b57ad9bb684113260f941ac764f329616f7cb0c0d758c1c0ece6611ac0d7551243890b6a6991af3fa45b8e2a1ab594da97eb5dffa9ce9cf8
 EBUILD httpie-2.0.0.ebuild 1055 BLAKE2B 81e139ebc0bf0c666ea991a8e2afef1d2927304244012a955145c16b2f73a4e04716ad5d5580d9ecf92a1ec276a4e46e5d43c0af24d660a96bed88120c39e597 SHA512 e4ee9b4188bf81da301a3f306ac19f2fa3ab9fa751fc6ff36183e2d065ff91c4ea3ae998f6ffb8737277fc9aca373190536a1b5f50b077e7a338b00379661c31
-EBUILD httpie-2.1.0.ebuild 1051 BLAKE2B 0fff59edd7b2731da9e2d8c45448d60f66ce20db4dd842491fe898a9ea2df00236151319b7b65005d2644d4bb753ec23110141bb802e24bfdc8702dda8f98947 SHA512 12efd9b94a95798ef5802e8610d3af43e3553ebcef42f8a15b6ce60312ca5ae6b5c9d2f806b5173541a0ebf4650a0b78f6470c4c3e910e5e82e2175ac574bbe9
+EBUILD httpie-2.1.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-2.1.0.ebuild b/net-misc/httpie/httpie-2.1.0.ebuild
index e3773e796fbe..bab02d0b537a 100644
--- a/net-misc/httpie/httpie-2.1.0.ebuild
+++ b/net-misc/httpie/httpie-2.1.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 b6c7151ee51e..0fe3c83a501a 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 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-19.10.0.15.tar.gz 102164402 BLAKE2B d432c0addc7dc01f371dbede8125d134c82b985b359afa9d91c23b4916976f19513e6b72bac969526879ff6f3de56ab1898f729123274af93273526138553653 SHA512 0244e09bbb4b7f1c53170127215a94b87754ab633d75100e8af4777d3013344c3a06f6ec3080e9c77bd5bf54b117ac520ff04aa349e9b291cb041b06903da71b
 DIST linuxx64-19.12.0.19.tar.gz 101477021 BLAKE2B 770df46d1d810443b3c7cdcb0820a15fed66dab7794bc859b9e18a162ea8579f0459e1665f276a862c0b0f69ff3b5f44bd620b25244e52ba5ce58bbe9c9e493c SHA512 47d37f9d1e18d8065346f918a86286261567149ad9d12266aa07248b66124c3698aa520c09639c44face14d087e9dcae85da8706894fca5d7dd641fca322a18f
-DIST linuxx86-19.10.0.15.tar.gz 109350883 BLAKE2B e7f7b98e04db9259b02177e18d5f2bf62975a50635e745b99d9c860370b468e63b30f01b85090b0749f962916c3606f4b53b66e1b6a271f6b33ba6a5d39c8ad7 SHA512 0d9e1692855d4122cef478a04059b0a7261165a50cebbf1524a426b841f65b6e26e01aa98865f7ba35ba7c8386eaf7d7301e5fc03019f9034c91971a53459c1d
+DIST linuxx64-20.04.0.21.tar.gz 111281435 BLAKE2B 2aa0b7fbde8f8ed11a5f6fec5d9434d58ec386220fbf30c52488664cccf5c488741ecde8287c91ba98308cccb33c2ef912212d755d2d61c41b32939263a7081a SHA512 e98d907fccc6b6b5e763ab75d55cdec56559ba261b2e8730dddd65662942f98a2d9167cd09e1c13efe811db12fa40edacaa3eea9e0d7ec319765c28f5626b308
 DIST linuxx86-19.12.0.19.tar.gz 105565838 BLAKE2B 44623c1f59a7ef8319676303a73a3045925cbe07b1b22b09bc2ef1b35cfbfff508fcce291d949ed66f27127fb0289f7c2efcff0be82cd2d30f578eb6c06d4ce5 SHA512 f53321dae6b7e144af4b4a58cdb17a72da41566f3f499ce9ccb4f29581b6640021c8529d884f9384f4e820c6458605156b54fb789fecff25c6e18d1435dd9e90
-EBUILD icaclient-19.10.0.15.ebuild 4602 BLAKE2B 8546bbeee55f39c6bac2e07962673ae7908a93503131c84d223b48c7ec69905fae5008398353f8873825691500bb108e3e29c50a01944e3701e364b5006f1271 SHA512 2440826e45bbaaa17f5c5469976a57c1628cb2b7c8bea92138d0822007e59afc587f4c8f61b3bf1dbea16448e832591e42a6e557934eaea2a78753ea9433b775
-EBUILD icaclient-19.12.0.19.ebuild 4604 BLAKE2B 2a06d3a0da9795cc17e6b7b575bca9efa7e39203a698a686d834db6dad613ee4b5eaf343391c95209745d68a521c37a46fee58a491786397cda09a80bcaebc53 SHA512 ccaaa2ba87f30197b807e5d248fc85402dfedabeeeecf9a246617663380178d41dd66de98431a64b27112de0d08a14976be6e4af717684b10ebc5305deb5b8ab
+DIST linuxx86-20.04.0.21.tar.gz 103733746 BLAKE2B ad7c16726722a90e31685325430c9fe67a2dd61a7829f5288db774957350bff2b97d26341230e1542fe98ee845f0eca7f1d757afe15e468bdad0c7df7c6bb352 SHA512 6cbd4a0127e73402df24e12b3c557f8388238f7d9b58ac9d850fa28767d272f16f6c6dd73b1201e62d58c98d4795f30a95a9f4263bdcebc3ca1c98a1a9152b38
+EBUILD icaclient-19.12.0.19.ebuild 4602 BLAKE2B 8546bbeee55f39c6bac2e07962673ae7908a93503131c84d223b48c7ec69905fae5008398353f8873825691500bb108e3e29c50a01944e3701e364b5006f1271 SHA512 2440826e45bbaaa17f5c5469976a57c1628cb2b7c8bea92138d0822007e59afc587f4c8f61b3bf1dbea16448e832591e42a6e557934eaea2a78753ea9433b775
+EBUILD icaclient-20.04.0.21.ebuild 4635 BLAKE2B 68c18e624ef3975a27f39a63af2637cfec73df6ef715d75a437c0a44e4e54ae21da42333087f7b10cffb66f5ca70e23a4ed325854a85d537be054d470d59c138 SHA512 157b7bb2bb1be58dfb732fe7885b37569dda6406fd80d6e3eda071f2102bbec8a67522bc632ff02a80c2655f3465ef8fa7ca1393a4d89a0d9488e3977423eeb1
 MISC metadata.xml 602 BLAKE2B d0a0f2a13b43053f748f4250ff9fd0f7aee5d53501d773081e646097e40b5a60bb49c4517ec4689272c2e14bfd51acff76c8b4c8575533697f8f069854a4d5eb SHA512 281c87fd74b63941c4ae76772c7020b0c70adfcde3e87be13cb9b0994aa4794df2c2904e623518812d1da8ea602b45c95db083ea7d239e7f0e7c9c92487bd68c
diff --git a/net-misc/icaclient/icaclient-19.12.0.19.ebuild b/net-misc/icaclient/icaclient-19.12.0.19.ebuild
index 53a177ba3ec8..0e8291847c8d 100644
--- a/net-misc/icaclient/icaclient-19.12.0.19.ebuild
+++ b/net-misc/icaclient/icaclient-19.12.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-19.10.0.15.ebuild b/net-misc/icaclient/icaclient-20.04.0.21.ebuild
index 0e8291847c8d..54a7c432466e 100644
--- a/net-misc/icaclient/icaclient-19.10.0.15.ebuild
+++ b/net-misc/icaclient/icaclient-20.04.0.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -98,6 +98,7 @@ src_install() {
 	doexe *.DLL libAnalyticsInterfacePd.so libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
 
 	exeinto "${ICAROOT}"/lib
+	rm lib/ctxjpeg_fb_8.so || die
 	doexe lib/*.so
 
 	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 1e9369561e4b..3fedd1853d0a 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -11,6 +11,6 @@ EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b8
 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28
 EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5
-EBUILD iperf-3.7.ebuild 978 BLAKE2B 40dc10444e3c2abbcb6a3f15ad8b8df7f9c4d2f91dcee14a5cac6ad4cef2282f37bcfead2576f6018af7652a7363e059cb5f202c21f42eb80f4a196ca39412d8 SHA512 791e853b3b2b810a95b0fbe24230fe56a885973276aab4c5e2623ca027a8d355f0762e711ad429a7fbe64e946c3e01c91315125eb1346156384385721e857982
+EBUILD iperf-3.7.ebuild 985 BLAKE2B 98d50eb4b100aef861017fe6cce8ff3513598095941e139df5d0f7fd7c59b5425cce4906e0d946b8ee6cba36214b827fde3f95dd4032cb55ac47a9a2c1d9eba3 SHA512 40ce051b5e9fa0f94245e9ac41da13d6f953d499158df675d042e3b5a0b994d6c7321caeaacafd40877982b30f825eb7c17d931764a106ff4d1d572bddb9b571
 EBUILD iperf-3.99999.99999.ebuild 831 BLAKE2B 14b3ad32e35b19fd52f3f4dd31d09e4de30300d200a46e3e32edbfac2ed70a0c93ef2270483327583d61bbb456b61ea73f34c0307c3435c2168f9c442ff24c2d SHA512 aa529bc4e36feff38054349e61338d1152bbfa379ca0eea9d77f8b339ce53ab5c93e10ced57ffc40d1515c95b87532f7548434468c56e5a059a5a873c176b1de
 MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild
index 45025840cf6d..1f4e52a28f0c 100644
--- a/net-misc/iperf/iperf-3.7.ebuild
+++ b/net-misc/iperf/iperf-3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="libressl profiling sctp static-libs"
 
 DEPEND="
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 399826077dc7..3bbdbf522dee 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.7.5.tar.gz 7337326 BLAKE2B 9fa3b16cdbe90503715987d72d5560da13ff619be85040c49572cc24ed83fe0e155c9c7be9785d6f918b1c5a5777ac3d59153fc313d6622d68025d6af4a34956 SHA512 1e31a9b2031d5dfdef18178abcdc30c1fe20ac4013c070cf01e2a2af56d4594fc8ae1edcc9e98483cd8feb8d9d916b893e42cfdd41e195c2d79d0c8800040034
 DIST kea-1.7.6.tar.gz 7362882 BLAKE2B 09b508f1f3b025c4e732f67f78757b7617e82453319348bc8550d6035331cb51347233057872085e967c6ad3fca56046c21eb64da77beef23039ea61512c4fc6 SHA512 5f48dc8fa60c9e8614237b27a5eff2857854e2878397c5d9cbb388abc94f35aedecedf696582b7ba4dbcd79c38c42af6557e013d5a9db4756d6e525af279287a
-EBUILD kea-1.7.5.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
+DIST kea-1.7.7.tar.gz 7391670 BLAKE2B 0a0cc58d74de5b0729c4e684d79e271d122ec689c623f72ae1f8b6f631bea99ec7416721f406a5dc54ec0132c090f8a7583818d0ec4e1a9507fc5c1bc13014b6 SHA512 af65a7aff9c06fe078df5ed72737b0bc537dc1cc790f0e32449b73642ee7b4b582cc30cfe37283eed66fe2617eae22d5b48c3991d0e53d83b99327ccc17f63c1
 EBUILD kea-1.7.6.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
+EBUILD kea-1.7.7.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
 EBUILD kea-9999.ebuild 1704 BLAKE2B f479319090a275bc18f010f230d7d44ce87715cba8a72aa87c97a44226c7998f9729558a0384e3166e119381462cf9a21ec8034790f8f4c9226929e31700d904 SHA512 371cbaf28455c69bcde417f25b318dee1425ee238058125d1a15ebcc57cfdab52735a8ba663b51abc0efb1b3874032a726546d9af756cc7a0c08ff9331006bfb
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.7.5.ebuild b/net-misc/kea/kea-1.7.7.ebuild
index 2f6a4dc21e8a..2f6a4dc21e8a 100644
--- a/net-misc/kea/kea-1.7.5.ebuild
+++ b/net-misc/kea/kea-1.7.7.ebuild
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 64dee373e930..115e4925fa08 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -2,6 +2,7 @@ AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d0007
 AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
 AUX lldpd-1.0.2-seccomp-add-misc.patch 789 BLAKE2B 49fb6cf10946154a7573778c558b5ac5754e1f2dfa87c7011c44b9515df5d4e06d6271e21e3a0104823603a6e5644cee944354621c937fe358eba79f5f03c8d8 SHA512 bcc473debe7f45c533057ca1ecd6ab717bbeb663aaee223045239152fcf7c92c1dcf5e77c5bd0d36f0dbc08739dc8fd90bfcc7c82c8019a3508f496cf7df2d34
 AUX lldpd-1.0.3-fix-fdp-without-cdp.patch 775 BLAKE2B 900476f2bd2e6671ed9fd1eb99f727d5b153681db85e83d28baaa6fef99bbb1e408488475b6370df337742e735b6d56f53183f1cd2072c1dbc9da5fb194bd7af SHA512 bdc0f61a467c5a5d5fddc64b3e9822a94fedc7d61cce96ab3996fd2b12e418453da27f9de7879f13b0feccf1080b8559e848b113826ca0733e60b0d28cc5aacf
+AUX lldpd-1.0.5-seccomp.patch 2282 BLAKE2B 6a3cd06b65576c4f2c54636778a628960104980d3bf0b05f4164b0062c7604fb694517457f0ad13a4b83086de5219b23ca7a795b7cfb16b2baf15680e5ad7036 SHA512 6818b88d17cab0b924a3f145ce82c24ee9e3ae6a450b82413f5979cd51fb1b58fe51a9fa98e5225e0f4229bf227a029abba5f02636319b74b01394e5723ddb95
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -12,5 +13,5 @@ DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04
 DIST lldpd-1.0.5.tar.gz 1624872 BLAKE2B 0c85cd05bd9e24c06038675be0e9e03228981bb815d8eb93ba1565eb2001dfbf24c183c9d10a1a3d194f49990e252a53730ef69a8b0e9e3151de40bb2ae5a5b8 SHA512 ce6075b6e2f847c4854c117ffc81d6e9f852e857d2bf88151ea7b3d40fbebcf980f65d4a21f17332de7f27fc696ce3ada3c063b8fa7677d7b9eee3e4634e898e
 EBUILD lldpd-1.0.3.ebuild 2541 BLAKE2B 91a6ce4d2e1503f2bbff6f29c5819202e069a9fa06b033438ff4d98525fe389f8d11104ff4a058a83301e7ddea473599e277d6e2c8ba01db2bc0d0605761bcff SHA512 c828991bae9872304317d2436445df7d0db20f97a8902ba2a4effd12d6730bd66ec7b9130766baee6b7b31b076efed529afb811ca2f96b10298eadb4400a15ff
 EBUILD lldpd-1.0.4.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663
-EBUILD lldpd-1.0.5.ebuild 2515 BLAKE2B 4a9c52827401c9cd32d6e914fe8e963498b57bc7bffbb0f58336385499f442c2df114d9e085aeda257016779b25a207131089228294f8382e6be00efae42f1f1 SHA512 2b78ff27eda0ba7ce765f03f222ee790d62bcf7d1df780d4f09a32edca424d32a245eecd8e0575898603e8fe0292602f0e0c82fa6bcbca317d4edf5a0313a663
+EBUILD lldpd-1.0.5-r1.ebuild 2321 BLAKE2B 8f5aa4915393eab19f0e7dc7e58a6f1bebe708da47ad22bddaffb77bec21f37d6bf14b159d1bfc737bbedc2495a6d8cd35f606bd29f931ae1882b1125af2fee2 SHA512 ac9a808768aede243e3d7a14b9739b31a0097598428e6ed2b5c63506125b856f92d383f1be0e577f5bcbb8791427658a3917a592e54510aa985b4210a8ab4801
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch b/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch
new file mode 100644
index 000000000000..4ac67afeec5f
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.5-seccomp.patch
@@ -0,0 +1,31 @@
+diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
+index 5a6e2ae..5cef36f 100644
+--- a/src/daemon/priv-seccomp.c
++++ b/src/daemon/priv-seccomp.c
+@@ -148,6 +148,7 @@ priv_seccomp_init(int remote, int child)
+ 	if ((rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(read), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(write), 0)) < 0 || /* write needed for */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(lseek), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fcntl), 0)) < 0 ||
+@@ -163,6 +164,7 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
+@@ -172,6 +174,10 @@ priv_seccomp_init(int remote, int child)
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(readv), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mprotect), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(recvfrom), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(clock_gettime), 0)) < 0 ||
++	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(gettimeofday), 0)) < 0 ||
+ 	    /* The following are for resolving addresses */
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 0)) < 0 ||
+ 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(munmap), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.5.ebuild b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
index 92e05bbf1444..bdb15ea083d9 100644
--- a/net-misc/lldpd/lldpd-1.0.5.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.5-r1.ebuild
@@ -3,49 +3,46 @@
 
 EAPI=7
 
-inherit eutils user systemd bash-completion-r1 autotools
+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"
+SLOT="0/4.8.0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
 	seccomp sonmp snmp static-libs test readline xml zsh-completion"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libbsd
+RDEPEND="
+	acct-group/lldpd
+	acct-user/lldpd
+	dev-libs/libbsd
 	>=dev-libs/libevent-2.0.5:=
 	sys-libs/readline:0=
+	seccomp? ( sys-libs/libseccomp:= )
 	snmp? ( net-analyzer/net-snmp[extensible(+)] )
 	xml? ( dev-libs/libxml2:= )
-	seccomp? ( sys-libs/libseccomp:= )
-	zsh-completion? ( app-shells/zsh )"
+	zsh-completion? ( app-shells/zsh )
+"
 DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
+	test? ( dev-libs/check )
+"
 BDEPEND="virtual/pkgconfig
 	doc? (
 		graph? ( app-doc/doxygen[dot] )
 		!graph? ( app-doc/doxygen )
-	)"
+	)
+"
 
 REQUIRED_USE="graph? ( doc )"
 
 PATCHES=(
-	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
-	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
-	"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch"
+	"${FILESDIR}/lldpd-1.0.5-seccomp.patch"
 )
 
-pkg_setup() {
-	ebegin "Creating lldpd user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-}
-
 src_prepare() {
 	default
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 0ed8a81d3eac..de72e03c882d 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -4,15 +4,12 @@ AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a
 AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec1ffe6f9d47a5a1e3b676f70d25a675d4b4762a4d69915a81cc0e30036e74254ce08f93b625bc842ae0e4a6d7520798f85 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e
 AUX memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch 1470 BLAKE2B 987f8ff094ae43e8fe94458b70f413b994f0125b16987b7aca56bb0847f3c6ff10372cff4a4f12fa651cad72601fef6b4a45cfe0c05036e264f9c53f5846e686 SHA512 c0c139d82762c397cfb86307ab989b3c0a31547e3bccb8b13b4537e78b7f62a4b92aafc60e5cb092098a95038a9f93e8ee6be8702b130fafa11c81112a1fce69
 AUX memcached-1.6.0-gcc10.patch 1345 BLAKE2B 11c090522e694b640880606615f97303e07b35e1fe399bde38ff5fb22355287b3cee2690fc3f00ac05b2c834e5bf94bec48b8ee64b47c226e2517ea0694dba72 SHA512 59c7cc5060dc3e09d991223f5eca8b951c114e2b6e61a56089ad559d376e1e002b653a1ac8ae5556dafeb6d3fda911a4ab07f41b89e1a4474aba00921a393a10
+AUX memcached-1.6.5-ia64.patch 1862 BLAKE2B a93ff1412d52a1c541a1c4a5dc5cf50e29a4f58e60dd2263a711d6a048510654e8a0a35b73eb7e65f33758fd9c2de458725988b0ae023c392840a714e17b0ba4 SHA512 06454cf3f39a0d5de6f0a8caaa822a7559dd7aeccc7eb366eacd54a5ef9eb7b8662c46f482b6518eb0a26e2c18a8f9971632b6182c4ede925f344cd73e57f211
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
-DIST memcached-1.6.2.tar.gz 536527 BLAKE2B e350ee10ed74d68206baa009fa49e30e6563a21fd617fc30c1c2695642f6a5f85662acc40471d903a54c26153ca904d1ce9fb3bcbc7bae5d06431069872ca812 SHA512 e695c1292fc85280be3d337990c37f6fcf85e1a73870d541b993335b12f33b31516b477c30169a40c7b5d24fac8c842fdc5f1f48348c5cafa593040229349640
-DIST memcached-1.6.3.tar.gz 538890 BLAKE2B 06d18dcfa00bead3d0d5e46a2660568544b0e6bf27b4f2c1759d9bf8170c0b5b78028303a530d651b4002053ec747b4c6a2dabc231b57cbbfa276ff1cc59f9f1 SHA512 f51248906f59eca3025dd8b56adcd49dcacbf706f66b0fbdafeb054a213d5595a8e13dc38a365cf852d3b1058f90a981f464e24025a4f33dccd09aa579f7cbbd
-DIST memcached-1.6.5.tar.gz 539962 BLAKE2B 2abe351d09a29c98a6a7710f05d1934d9733366e32489137f281558abefa6183e66ac4b1acf44af5c1772123ffa032f460bf796acb6258a908d6ef1e38262f88 SHA512 e6cc2db70bbd05dd40131ca9e0cbbc72c41d747f64b6e6e6c2e3ac2630b67fefcd5e945b2e8d57db6d0b379ba9c34d89eb2c19f20391493e4e2390d7a1616d90
+DIST memcached-1.6.6.tar.gz 543661 BLAKE2B 04de48d6450961585ac3b1c8ae6f803c59e5bbf34e45aa27c9e53309350608dc3c899cf169095361c4ccdc44e0bcc2860662d7066477abd7fdc8e80e34d22d36 SHA512 dfd19bf42d35fff391bb479338706a83082e3cdd3ff6e225d3d4da9df01b0a1f659a012dc30766651ffd57f0c19128fc4c3df29b721e588c909656d02cfdaa0a
 EBUILD memcached-1.5.22.ebuild 2956 BLAKE2B 149c5f1c78050f0b36086811f632ead56840a56edec63b1da22a3642c223b6fbe9eb01b55dd5f032cfad3ce540d6eeb68e34787dfca382c921fa85cc324033f2 SHA512 e05ce60c58028f51ef572dde0319d669aa9aa21c227cf7490bee0a9678144b3f11fe0a525421a2ae1c016cf0027d74bd3ec861c7aa1d83119a2d16301f29b490
-EBUILD memcached-1.6.2.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
-EBUILD memcached-1.6.3.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
-EBUILD memcached-1.6.5.ebuild 2892 BLAKE2B a5d787736c17cd4e1ff38fa8c488f079a89f4667c653394439091bd20b145154b21507438077f30b059c0861a98e6b6ec49370d693ce8d548effb729ecd5a5cc SHA512 59d4c46e3e54741edac6e38492a9735bbbfaeb95efedb3fe4b2d0cc1cf2c9b0c588f46ca292a4b857e7e674c529bbda56d72d9115d8be3c55d05d3feb5e5ed7a
+EBUILD memcached-1.6.6.ebuild 2890 BLAKE2B c91614a11022713c534524fc053b9d669aaf716ac47b7197c0732077ed31cb7a8e27a0240fd785542cec44fe5fc7afa1b36e5f50cc96e17bb194e3fc80835ea4 SHA512 e22a7b8a8e7ff6733ba5380e2765f935b313f09eef93f5df292924078a8781f710f5e6085a5efef6a35358f50a7c174c0d2c425709d5372536de035a2f626b9b
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
new file mode 100644
index 000000000000..5a73913b92e6
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
@@ -0,0 +1,51 @@
+https://github.com/memcached/memcached/commit/73633d31b22068dfda5ef969c08139c083d96d71.patch
+
+From 73633d31b22068dfda5ef969c08139c083d96d71 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 19 Apr 2020 10:08:19 +0100
+Subject: [PATCH] crc32c.c: don't attempt to enable hardware crc32 on ia64
+
+Itanium has no hardware crc32 implementation and build fails as:
+
+```
+ia64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I.  -DNDEBUG   -g -O2 -pthread \
+    ... -c -o memcached-crc32c.o `test -f 'crc32c.c' || echo './'`crc32c.c
+crc32c.c: In function 'crc32c_init':
+crc32c.c:385:9: error: unknown register name '%edx' in 'asm'
+  385 |         __asm__("cpuid" \
+      |         ^~~~~~~
+```
+
+The change removes ia64 from crc32 paths.
+
+Bug: https://bugs.gentoo.org/718136
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ crc32c.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/crc32c.c
++++ b/crc32c.c
+@@ -167,7 +167,7 @@ static uint32_t crc32c_hw_aarch64(uint32_t crc, const void* buf, size_t len)
+ #endif
+ 
+ /* Apply if the platform is intel */
+-#if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
++#if defined(__X86_64__)||defined(__x86_64__)
+ 
+ /* Multiply a matrix times a vector over the Galois field of two elements,
+    GF(2).  Each element is a bit in an unsigned integer.  mat must have at
+@@ -388,12 +388,11 @@ static uint32_t crc32c_hw(uint32_t crc, const void *buf, size_t len)
+                 : "%ebx", "%edx"); \
+         (have) = (ecx >> 20) & 1; \
+     } while (0)
+-
+ #endif
+ /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
+    version.  Otherwise, use the software version. */
+ void crc32c_init(void) {
+-    #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
++    #if defined(__X86_64__)||defined(__x86_64__)
+     int sse42;
+     SSE42(sse42);
+ 
diff --git a/net-misc/memcached/memcached-1.6.3.ebuild b/net-misc/memcached/memcached-1.6.3.ebuild
deleted file mode 100644
index 75cbb9370f34..000000000000
--- a/net-misc/memcached/memcached-1.6.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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 ~x64-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.5.ebuild b/net-misc/memcached/memcached-1.6.5.ebuild
deleted file mode 100644
index 75cbb9370f34..000000000000
--- a/net-misc/memcached/memcached-1.6.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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 ~x64-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.2.ebuild b/net-misc/memcached/memcached-1.6.6.ebuild
index 75cbb9370f34..3ff5cfe1d936 100644
--- a/net-misc/memcached/memcached-1.6.2.ebuild
+++ b/net-misc/memcached/memcached-1.6.6.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 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 938848da4a01..1ab26511c7f7 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -3,5 +3,5 @@ AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.2.1-r1.ebuild 2745 BLAKE2B 6b9f3f17ccad4f1d0ab932dfcaa3dc49967491bec297a5bba40c0b6b4a9dd10e0c3b2c29e9e7737116499b78054a80bad4b64ed16f61857d38fd89133d9b0794 SHA512 57b80d442e91e9c56cb1238c54c4a421b6e5dd84298186266a0aad0bfdcdbcbe5261922810ca66a4fae57859218f4d2bfadf6b0c6e58fcc7187604c4563257a5
+EBUILD minidlna-1.2.1-r1.ebuild 2694 BLAKE2B 7931acde7b9cff535e4eb64f52110ecc7edccdfdd88d00cee2fce217a307bccb81a89c4b62a8998ff7b7ff7e28bf32e396d188788b8c09c65a698243afba816d SHA512 fc915f8dc7465a8e2d5e5edcc9c84f6cf6f26e5cea2f584f044ff9fe074721e4c8a91b73852fe6d6691c3f7859fab1c7fe98b58f0cb2cce7f75e658bc71cd4ee
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
index 53e65e1fb748..47ee6484cd27 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="libav netgear readynas zeroconf"
+IUSE="netgear readynas zeroconf"
 
 RDEPEND="dev-db/sqlite:3
 	media-libs/flac:=
@@ -22,9 +22,8 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/libid3tag:=
 	media-libs/libogg:=
 	media-libs/libvorbis:=
+	media-video/ffmpeg:0=
 	virtual/jpeg:0=
-	libav? ( media-video/libav:0= )
-	!libav? ( media-video/ffmpeg:0= )
 	zeroconf? ( net-dns/avahi:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 4d04f5d719f9..6b9306631718 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,7 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.1.20191006.tar.gz 243255 BLAKE2B 38654cfc0238cdd413600216b01465cbecda69589249df5b6500db7e0719053dae351ab8c61d763a7586924f68b6d634266a1020084f30261442ac62fbd17a5e SHA512 5de2dc5ffb6df7b06bcb6ab8d8fbb34aa5a229a8310938e980b4caf6b957ceab104c455cebb57d7083736fde2db9569fcdf98783a36c915d362f7ff2987e3599
 DIST miniupnpd-2.1.20200329.tar.gz 243725 BLAKE2B a9ca048744bc8f397e10bcc5e27638285d0000700855952cce4c2ba7959b2c9099e18045bd5e9103c67da79c90d04a2e505e064bcb1bbca5574437d4625101a5 SHA512 3f6a1a6f08924505a6db5ca5b1dbf7c59f8b48647c59a600799b020146422497248367767e41df0715bd9774129f2d8f95c4a63493af2db849bbe006231e6edf
-EBUILD miniupnpd-2.1.20191006.ebuild 1973 BLAKE2B 06623d2fd8d2b2e31c1c9515ffa34aa5f083662f78c3b4478ae7003768e4a272419a9654bdc4e201bb2871bb5c11dc16ca52144687786c2593c690afd40d2a7d SHA512 b231ba28a2dbbb676b76cc07706167d194f5d628f228d5585dd3dfd7effd1e79a2526d9f53912b3c32ee0e3ba1ce32f45d15d636afee3435ed6c59845c539cda
+DIST miniupnpd-2.1.20200510.tar.gz 245426 BLAKE2B 17b5335bb4cfb55a517c1f0aeb1eabd7515c729480ee737a8ba525988e59f067e18d2de78393df2ff62cc15201a742d17a17d5632601c1d98ea2a943dcc4a393 SHA512 36a5d1844075a93e76f13aba8820b3747bcc8f562c8cbcc562f991ac154e91c951b5caaa9b7c7066cf80534066c3ee6e20a066012b830143f0a7352cb9f5d71b
 EBUILD miniupnpd-2.1.20200329.ebuild 1973 BLAKE2B 37124c901c4055cca0a10b90e135fb31a85bb90f40d330ec765d28c9742173c38f856ebbde4cdf9e9f40c759ec090b53732fe4814b4297a2e6ef8b907a454e43 SHA512 2cad4ddaa9ea78cc1c8425499a268164fe4f4d93d34c27c5d88693946262a4490a9ff8047984dda9d7088ca82ed2a95e63c04ca5ee971e4eb014341f733005ba
+EBUILD miniupnpd-2.1.20200510.ebuild 1843 BLAKE2B 94c397a041d7d7b6bfbe31691e1b7bf41f8f653eea88ff9f463b02f3a325e9ffe834c430a9ee7b80b90884c05b2d07d65bf206096e7cf09fa7a73deaf2f9dcef SHA512 ef68c939cb847d712c7953c65e9913b9ede642c9f1aee5b6ea92975ae3193a376ff8562ecdc804d74774d81ff22b7136dc3048d6a5bb1fb3c738311433298c1a
 MISC metadata.xml 902 BLAKE2B ec10dab38256289a3445ad960eb869fe01ad009e21f77e61ffa4e45cac71120df285461cc3515de395918635b8f76a5448d761f9644172064e1eea79aa926947 SHA512 931799b28d6b7b1676d7ed0b94ce6760b550087785885635cb03c656c20e51c810a75dd8d675e17e5b8fdb87e7909f2a972ba11e168310eef4f58efd0a065135
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
index 2e0b60b3a3d1..b208d8cce8f8 100644
--- a/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20200510.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,21 +31,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-apps/lsb-release"
 
-src_prepare() {
-	default
-
-	# Prevent overriding CFLAGS.
-	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
-
-	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
-
-	# Prevent gzipping manpage.
-	sed -i -e '/gzip/d' Makefile || die
-}
-
 src_configure() {
-	local -a opts
-	opts=(
+	local opts=(
 		--vendorcfg
 		$(usex igd2 '--igd2' '')
 		$(usex ipv6 '--ipv6' '')
@@ -53,9 +40,13 @@ src_configure() {
 		$(usex portinuse '--portinuse' '')
 		$(usex pcp-peer '--pcp-peer' '')
 		$(usex strict '--strict' '')
+		--firewall=$(usex nftables nftables iptables)
 	)
 
-	CONFIG_OPTIONS="${opts[*]}" emake config.h
+	# custom script
+	./configure "${opts[@]}" || die
+	# prevent gzipping manpage
+	sed -i -e '/gzip/d' Makefile || die
 }
 
 src_compile() {
diff --git a/net-misc/ncman/Manifest b/net-misc/ncman/Manifest
index 21b244307952..1a7db9a5a520 100644
--- a/net-misc/ncman/Manifest
+++ b/net-misc/ncman/Manifest
@@ -1,5 +1,7 @@
+AUX ncman-fix-for-json-c-0.14.patch 1586 BLAKE2B 37c63f15cea1e7ed4b95d54a005ae67aa068a0af0bb09b63759ba68069772590a8232bf194231efecc5f8c5d8ec3632aaf19fbad8ba0cece17dd1178bce72294 SHA512 469781a3d8a26cdd536d8795226a14cff57329a7a2f68293f5998a3560409fca25d1adf184bfb5088782fc19ffeccd8b22e3a4c64b3710ce7a96f686341b996d
 DIST ncman-0.0.1_p20190327.tar.gz 51925 BLAKE2B 020092e64ccb55563cc891699550911411b67b749a49fb6bab4962857b59c93fb05109afacb88a5e42abc9030683af66aed2e44aaf0bd1cd8931c9df019bdc52 SHA512 24a3b3eec57987e290cc319e409e8da00f14e260360c606b3a89ee2e092976d0b1c256a4b1be40870bcaea620a482477c4aed53fa0e1719c297fc9edd524235e
 EBUILD ncman-0.0.1_p20190327-r1.ebuild 796 BLAKE2B 65d65b1572418507a518e13d1b4e0861ff9cc3d7757dce42ddf7988449938857696e51a45360b535e59fc355574c972210e207469e70e1f0aed445ed648fa5eb SHA512 679cb7ff2b81998de0eb38ccf26bac798db605db0d750170ff98ee968d032663bba2c679675f96af3f3d9ecacace2a1f6c08cee2d7688c3d1822bf9fd0889d64
+EBUILD ncman-0.0.1_p20190327-r2.ebuild 855 BLAKE2B ccaaa376e826a231830e2991b05a75a1b45fa88c31d77adf8eab513adb761f573bface1b8304188ad55d37d4e7b69d7d962a4340813d5ff28e8649935bf8605d SHA512 350276af6cd23c7c345d3ba3b2a14685f397a19e9a68b71f637e0784fd44866ab7c6f76072ea54b0069b1ec5f81a87b4f31d1c2e5003dfcfc4ff6eaa599cb2e6
 EBUILD ncman-0.0.1_p20190327.ebuild 536 BLAKE2B 55e75c03200470f58100bac93c67877aa380757a4715a12b14aaf572f6524e115d799c2d3c80a60a6469647c7a44f55853ccb221d26205bf3896d6c952c6896e SHA512 d480d1afc2c4909802177bc39c2326877775d02567b9e748cc4d8cef50b5d5996a534dda0b27936a9dfd064e787a6f5fcad97793350247e30c0a9001c833d124
 EBUILD ncman-9999.ebuild 756 BLAKE2B 5e763d6ee99f25641fec73594f59fa808c56e57a1cd12e424c85f48ad917f4215bfd8db2421f7b552d22c305648451fa2f2174b15c58cdbe25087111bb682205 SHA512 5eebcf6839e40d0abdf91a721f36d172ce69fd306b36ef021c4ed498fb9c7e3480125ea7d084f852df8485fdde0ecba32d1658085f61e3a0ef495c7b11957ffa
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/ncman/files/ncman-fix-for-json-c-0.14.patch b/net-misc/ncman/files/ncman-fix-for-json-c-0.14.patch
new file mode 100644
index 000000000000..c0ff5ded937d
--- /dev/null
+++ b/net-misc/ncman/files/ncman-fix-for-json-c-0.14.patch
@@ -0,0 +1,33 @@
+diff -ur a/src/json_regex.c b/src/json_regex.c
+--- a/src/json_regex.c	2020-05-05 06:50:49.643196630 -0500
++++ b/src/json_regex.c	2020-05-05 06:59:32.722322215 -0500
+@@ -64,7 +64,7 @@
+ 	json_object_object_add(jregex_agent_response, "Username", json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(jregex_agent_response, "Password", json_object_new_string("^([[:print:]]*)$"));
+ 
+-	jregex_agent_retry_response = json_object_new_boolean(TRUE);
++	jregex_agent_retry_response = json_object_new_boolean(1);
+ 
+ 	// See commands.c __cmd_config_service for a better idea of the format.
+ 	jregex_config_service = json_object_new_object();
+@@ -94,7 +94,7 @@
+ 	json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(tmp, key_serv_proxy_excludes, arr);
+ 	json_object_object_add(opt, key_serv_proxy_config, tmp);
+-	json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(TRUE));
++	json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(1));
+ 	arr = json_object_new_array();
+ 	json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
+ 	json_object_object_add(opt, key_serv_domains_config, arr);
+diff -ur a/src/json_utils.c b/src/json_utils.c
+--- a/src/json_utils.c	2020-05-05 06:50:49.643196630 -0500
++++ b/src/json_utils.c	2020-05-05 06:59:46.140940810 -0500
+@@ -83,7 +83,7 @@
+ 		key_is_trusted = json_object_object_get_ex(jtrusted, key,
+ 				&tmp_trusted);
+ 
+-		if (key_is_trusted == FALSE)
++		if (key_is_trusted == 1)
+ 			return false;
+ 
+ 		res = __json_type_dispatch(val, tmp_trusted);
diff --git a/net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild b/net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild
new file mode 100644
index 000000000000..c57a4f960f9b
--- /dev/null
+++ b/net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson
+COMMIT="21a55145ddbc5d085e91352586875abe92cff73b"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=https://github.com/l4rzy/ncman.git
+else
+	SRC_URI="https://github.com/l4rzy/ncman/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="An ncurses UI for connman, forked from connman-json-client"
+HOMEPAGE="https://github.com/l4rzy/ncman"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/json-c:0=
+	>=sys-apps/dbus-1.4
+	sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-fix-for-json-c-0.14.patch )
+
+[[ ${PV} == *9999* ]] || S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	append-cflags "-D_POSIX_C_SOURCE=200809L"
+}
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 2e95696b66cc..b8671d266016 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -5,5 +5,5 @@ DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6a
 DIST netkit-telnet_0.17-36.diff.gz 27226 BLAKE2B c19370f6462295bb7e8d09307121ec3356e9d1751b3ce5b7985844f54506351f633de381ffb3cd3209995c1826aaaa9ce716084742d4689d626b28aee8a3eb43 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
 EBUILD netkit-telnetd-0.17-r10.ebuild 2477 BLAKE2B 7719524ef10775ac242aff780e1d272cd1b064577dcc45b83c3a974ac4923a88735859071c5c1403c3d5118a8e5944fe05b3f4f52b4818279e157146a6b2676a SHA512 dc261e2c8a9cbc0555fb6d4016f6914002630449fe74ce152d0eba4db15f31cc88d0608b40d8a2c12d2c0de999abd333ee8f571ac28370ac3cfa565d6415810d
-EBUILD netkit-telnetd-0.17-r12.ebuild 2503 BLAKE2B 6024fe44a87d4598e78056042911ac5144d68536f24c5135fdace3a408772aeda0ba6741d081048858392037c97d75d20f1f936b3b3500cba1d53b90480df7fc SHA512 d9bc334131caca69607979d1416d909188c367f0e9fcc6d2494bac8ad2f558cf668a3d448daa19da87adf455adf4ce37802fde2bea0dab1c4d5a052805c2e5d5
+EBUILD netkit-telnetd-0.17-r12.ebuild 2510 BLAKE2B 1447a3df0ac3d8a8081b90f7af273ee9932ba23959ef049af94c17ad9315afe1a74ae15723d16b06f4fba1300f443c05a46e4d91be9c67c0b8d6a27dd088f8b1 SHA512 f3607be170eb971ec43de23dc72948993a7d1700dee068f021ee6e66aa28262fd748748dcb49aa5238c4966498278bc4a2775f5ffebb2b1fa6350c24b7a6f8d2
 MISC metadata.xml 462 BLAKE2B 430d6a3e7d34a5dd9a1601da947199fbd2c5b7baed723525064ae6335e02b59e6cbd8309a82f864cf9a8bb245f49ae01155f7effa8412ea91dd792585decd296 SHA512 f607e0ea0ea03ae7f941c5e27672b8b46bd14164460a8b2c86e4d57df68b549668f9298413f7293dd96dab53d18bd19c46f55e7e77a88ed581553c4502a8f3c2
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
index aacfc0d9e905..559f510fd686 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 ~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 d8de2514da93..1b4b1766af56 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,10 +3,13 @@ AUX 1.18.4-iwd1-compat.patch 3033 BLAKE2B 4f25f0f425ad13a91776d11d3df4d153f0ebdd
 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.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d788a6e979c2d7f232259e682fdc9e1f5569259731fdbbea65b6e8321561ecb8354b6f7a0b10843eb17cbe6f5937af8d9d898 SHA512 61b6214188a3cd281d0d5a5b8bfc402f8a19d8beaa6a3a2bd85983991cc66d62b2c3785d7ca652373903d53331610cd63a45d94bdb355196d939c48f42be29c1
 EBUILD networkmanager-1.18.4-r3.ebuild 11451 BLAKE2B a40e6bf41b7fe4c2eeeb2bf37c04e3a49bd9b7cc98c742e4632d094d232130a89a3009bd560ec860e3cf63b080dc0e8acb9d2e63989161eb3a0bf8c4a95109a5 SHA512 1aaa83f0540d0445cd22a5de38da6d9f93b12a99797bfe053143e17ab64994cff063f590144e9eede46a7e32b7ebef6bc0c24a15522e8f305960a539d9592933
-EBUILD networkmanager-1.22.10-r10.ebuild 8778 BLAKE2B 5286adf58bd982f15316711651fb854c6cbb853ecbf951bcb29ccf21c3edbce97e518c4b3453b2bf5c1951c6559e37aa93f1620c0b508409e2405eb24a2f2bbd SHA512 57417c17632d3a0d3a76fc1c4342f98d44ffec95086397bdbd089cfdfd907a33370f8507a8a60709685c35420d531660ee198ed1ae0ea23c860f8695b051a4e7
+EBUILD networkmanager-1.18.6.ebuild 11458 BLAKE2B d934baf78c6c0960910870de17597a1ac3705177c300a3eb30fff1a222168c863253f890da9f4987b22699cc675d93724ec89b441767102d989f5dcf3c5cb8da SHA512 99ee25dc331584361cd5f655b5f0e57d6d990d7272cf411c27c1477e58efe3303109ff53e5a3b4b473f61ace2b2871aac0a187194ecaced07477d27280a3d8cb
+EBUILD networkmanager-1.22.10-r11.ebuild 8778 BLAKE2B cfcb2044f5f9d7bfef67cfda7d58d032ca9e2cce7e9a0ee0fd64caa9875c6f6873a01823f4b56a1ecd25680dba145bf5688c580f5c465601eaef0313ebf65381 SHA512 a271e30d97f2effe6b12a168c10e4a898bb0c4105c73525db4c864cb9ab0b2a2bc3241a74f22f74fa7f1a5d6d99fdbbc528be5c28c77a2cd1adcfc159ed1e7d4
 MISC metadata.xml 2274 BLAKE2B c7c338380ebe7344d1d41d83b843e33388d890fc497301657519643eeb63d3f0b739d367aa27ac3a5826c36bdea9f0b48c588d1779872337763f5aaa810a1107 SHA512 bb57e8de13843938e7218c85631be6796a6976e88da2ccb9197c0495e655f639a54ec5aec61c04c59564132876850f3e56b9b40a6de8a0420388345fe38c7e89
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r2 b/net-misc/networkmanager/files/init.d.NetworkManager-r2
new file mode 100644
index 000000000000..f7b95c047cd9
--- /dev/null
+++ b/net-misc/networkmanager/files/init.d.NetworkManager-r2
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
+# Copyright 2013-2020 Gentoo Authors
+# 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_pre() {
+	checkpath -q -d -m 0755 /run/NetworkManager
+}
+
+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/networkmanager-1.18.6.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
new file mode 100644
index 000000000000..b410b2553ee6
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.18.6.ebuild
@@ -0,0 +1,349 @@
+# 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[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+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.22.10-r10.ebuild b/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild
index a6ae13c86a5d..b2cd3babde33 100644
--- a/net-misc/networkmanager/networkmanager-1.22.10-r10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.22.10-r11.ebuild
@@ -281,7 +281,7 @@ src_configure() {
 src_install() {
 	meson_src_install
 
-	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
 	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
 
 	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 74816352ec5a..d0ffc48eab44 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -2,6 +2,7 @@ AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472
 AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe
 AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd
 AUX ntp-4.2.8-gc-tests.patch 1183 BLAKE2B a92f418a901f65b06e154be27794cc4f8fa99bf0c19f1f8240c79682503bf9742d3ebd00e6d189884db702bb814caee6b197f4be3233eaf01d1d54c40a01e6e0 SHA512 b761776bdb0ea50781c57c19e6f132a7ba596e944e06bef53d1d9a4ab154f6c941ef1dd7b7d7130de546d59d9d6a7df25517590f015f9a91ea7fede41d95b471
+AUX ntp-4.2.8-gcc10-fno-common.patch 729 BLAKE2B 42692a4ae85bbf59d8f9ea22109b189b597234cee236d18229efb4e53181b6288c04a25f77300ca98af10fca9d15cb3df6bd962244eb40047ae6fa345b906b72 SHA512 794a2879a686423609f424fb73b7a1416cb0253b262b4c6b3bd42d9bb46441987daa87873bd343cc2987a9d65da887bb132c95c2bb1515ffb39637f9e64b1569
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9
@@ -27,5 +28,5 @@ DIST ntp-4.2.8p14-manpages.tar.xz 25720 BLAKE2B fbb7342729155be6863962136a779b33
 DIST ntp-4.2.8p14.tar.gz 7007263 BLAKE2B addcf94b58ea1938914115b662b4aa071586f1ff2cb66823c85fa92d4097c8fe5ce8583a7fae6dd4f7d8ff433348f1eff740bbeb210a1c08d322fc9076a84847 SHA512 b0183b4b2f2c6ea0a49d0aca1fa28a7b5cd21e20696a2f633f5afa37c4ea2c59fa7769af82a55c626db49b9eb5a531608710dc1977c4d518583577ef95940ae8
 EBUILD ntp-4.2.8_p13-r2.ebuild 4542 BLAKE2B fb88e178f76f757530d020a9987f8fd3f70b81e22486e8e30c997635c500795b04eb5bcfcd5cd6acfa0db7fd480f3903e65a91763cb68d9b3e3a3b77f3dde2be SHA512 bf5dddbd1d8b3b387864275b70edb49440696e846e2631227f8092e737c97d9346b1b52cbf02033f61833912907a16442fa46464098aed0ff471ba2d1f7c4914
 EBUILD ntp-4.2.8_p13.ebuild 4482 BLAKE2B d1b16d12c8f6229096d925d9764c265e74e84935d55b47c35f3a05d7eb0c68d9c9890c069c078533b61797322bf960c30c7bb8c2caa4726a528c13998bb5ab8d SHA512 d5a96d8e3f1aa99b8bcef1c3d2846e4590f272b343ea7fbd099a332b935429219db5f1320764e2c2072d6b0390ae1917a70d7d331579b5d7b25e7fd8de80a57e
-EBUILD ntp-4.2.8_p14-r2.ebuild 4554 BLAKE2B 53716498d82265c1db38cff06915df334754d5af5a17b587fb39e3a36ea2c78198a4c6a635e822164458f9b4c8c85cf6c514172a8444ef4fb5fc16b82d59a97c SHA512 8c946674cd2407c27d870e890a575a70cf7866a9a52941f32f599bb8d6153e34a3cfae78d78b9c9f87eaa03267baed7bc241d2e402763a88d01fa34f995a2384
+EBUILD ntp-4.2.8_p14-r2.ebuild 4595 BLAKE2B f1e6d0463c435249205a44d6215099e79278172acc560770723b293409432c265a9cb2d0a1733a2331ec453bc03fc8ae6e714aa33d403df3810d72437d12378b SHA512 7badaee6ba22252b003d3345b3cf08d2e9365f0721350279bebda13ec10e1bd8139c413947c45cb0ef63d0acc006f31d597c3cee634b1602f154a71a2daa8175
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
new file mode 100644
index 000000000000..d2ed719d8ff7
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch
@@ -0,0 +1,22 @@
+--- ntp-4.2.8p14/include/ntp_config.h.psl
++++ ntp-4.2.8p14/include/ntp_config.h
+@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag {
+  * Poll Skew List
+  */
+ 
+-psl_item psl[17-3+1];		/* values for polls 3-17 */
++extern psl_item psl[17-3+1];	/* values for polls 3-17 */
+ 				/* To simplify the runtime code we */
+ 				/* don't want to have to special-case */
+ 				/* dealing with a default */
+--- ntp-4.2.8p14/ntpd/ntp_config.c.psl
++++ ntp-4.2.8p14/ntpd/ntp_config.c
+@@ -202,6 +202,8 @@ int	cryptosw;		/* crypto command called
+ 
+ extern char *stats_drift_file;	/* name of the driftfile */
+ 
++psl_item psl[17-3+1];        /* values for polls 3-17 */
++
+ #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED
+ /*
+  * backwards compatibility flags
diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
index b2cbb8b926a9..2b72249e9970 100644
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+	"${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 896168b803a0..259b6b39ee4e 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,7 @@
 DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
 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
 EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
 EBUILD nx-3.5.99.22.ebuild 3243 BLAKE2B 96efb3e409b0e6253efcc1914ae5bf5d1020999e682a729dee71c188126aed73b9abbbf62b1cfae46427c1a65c0365c94e5d321c825b4775df0b5a06ff17ffd6 SHA512 159ee29ca7dc9a1d8ee12ee5fea8a10a0bb1ac28762d08208dc15b547e8d4d15b06de001e13f36c8648c193155ba1865f02d05be7d8bf25b228f889fd509711e
-MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
+EBUILD nx-3.5.99.23.ebuild 3392 BLAKE2B 676f533494f67fe8285db1d5a4ddd715c58ae7ce78d4cf7e4bc63d330709735c1d814426cdf80303a6420686deed5be75d3d82b2d0fc65fc4e9b04052207890a SHA512 a4020facae074b7f123c165e2009d4c1b7dcf3e33c2b1917dbfd80fc5d210c0cc93886158cfc4fb8153752a9e368910bfb750eab4a43b182581c9b4645a8aa56
+MISC metadata.xml 431 BLAKE2B 0c5df628b0e1167d246de69dd43a789efd3a19257cac3c77a6e63c787e3b33df11fb46d3ee400148ed224f8c1f3a46a0a717c6945cbb5a75dbaf7db090f87d88 SHA512 919a691eca3818bbec94ce6864333f073e41808ed0e897677ec66321812998cde78cfefd6ad344b350633f315a64288476a209d9029fa4b35873d2a1f49934a2
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
index 1b5df39c0204..d639b5037599 100644
--- a/net-misc/nx/metadata.xml
+++ b/net-misc/nx/metadata.xml
@@ -5,5 +5,8 @@
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">ArcticaProject/nx-libs</remote-id>
+</upstream>
 <longdescription>Special versions of the X11 libraries to support NX compression</longdescription>
 </pkgmetadata>
diff --git a/net-misc/nx/nx-3.5.99.23.ebuild b/net-misc/nx/nx-3.5.99.23.ebuild
new file mode 100644
index 000000000000..55b6eb9d8316
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.23.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic 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() {
+	# Workaround until fixed upstream
+	# https://github.com/ArcticaProject/nx-libs/issues/907
+	append-cflags -fcommon
+
+	# 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/nyx/Manifest b/net-misc/nyx/Manifest
index 5ccf6a21618b..ba891b486125 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,5 +1,5 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
 EBUILD nyx-2.0.4.ebuild 641 BLAKE2B fb3c515f583cbf55a513c54630f13218516a73bf4515ccb2f9e7a9a2ffdf0813eaa75e00f7a4c61de54eb3bd9e5e0be9687763325a0016d33f1926f8ee89b543 SHA512 449650b92a90e03b8a22b8b112788ac953ce2f40903045cc3bbaf1b9041961ae03999629675453a5a3d80e3de437e6e973f6726a75349e9be2e5351bc4a48b36
-EBUILD nyx-2.1.0.ebuild 651 BLAKE2B 5490cf50b4883e1c91f8f879e30a65645eb78c0675c67583c1d741cfc94a02965ae7cf910a85e8dda2817865c004ddce1a2e32644eaeb58308eca974be0f240f SHA512 923ab719cdf7b597c48d472bf3ea28a4d4856a709fc7fb5f870cdb05ae8694c7b1a65ee2a2d4a5d8160a09ba1ad354594b230c9f01347a83f1684eaf3e35c932
+EBUILD nyx-2.1.0-r1.ebuild 668 BLAKE2B e9e3cc12fa36399a9313f049637d04462e1043e5eda7d51aca69fac7bc8faf56d95bc6d6d5079ade69ebb70dfdbb5a922ad3d96d9adc3d74b33d5f250fcfef96 SHA512 2a01873e67bad28368ded27d588d4c50421b1597cb0e6bcc91863e11a2a5dc731a49d7c553ade8c64065a9a98e6b1502f2a88adb0b62f956192956ebc4b19a37
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0-r1.ebuild
index 99d81268a583..39a256ecefe0 100644
--- a/net-misc/nyx/nyx-2.1.0.ebuild
+++ b/net-misc/nyx/nyx-2.1.0-r1.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+EAPI=7
 
-inherit vcs-snapshot distutils-r1
+PYTHON_COMPAT=(python3_{6,7,8} pypy3)
+PYTHON_REQ_USE='sqlite(-)'
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
 
 DESCRIPTION="Utility to monitor real time Tor status information"
 HOMEPAGE="https://nyx.torproject.org"
@@ -21,8 +24,6 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
-	net-libs/stem
+	net-libs/stem[${PYTHON_USEDEP}]
 	net-vpn/tor"
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index d134521cfa88..7235d98b3034 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -5,5 +5,5 @@ AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f
 DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
 EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
-EBUILD omniORB-4.2.2.ebuild 2713 BLAKE2B 2ef1001494b824fc3f71995d848c225dedb5eedc4132b084eaeabfb05a3fe01b812a9d4a74cd11608ddbb7779fcc8eb581d6955f65aa482cf2d8e9b65b40d4af SHA512 6eac06118324c8c1b5acfd169d837c81abf9b1f0ace60cb696deffb36bda26dc3687ec8a11dbc826a9143c2d6a14c241b33fe539e9c8954f24ab7a0f581f1987
+EBUILD omniORB-4.2.2.ebuild 2703 BLAKE2B da513f172984381c01f512ca8c18fd20e6cc97d63d5824137d96b3601c686f265ef152dcf2f30f4bb33069a34f98f8c546a99d18ad5b404fdf90f8359d53cfd7 SHA512 f30921b474d37d5db13be0789736fffe5e4188cb12006b1c132ba71576f02b88bf635c096414792daadeca45a7f0b3b841bad2f8cea9654095f8c54851c2705c
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/omniORB-4.2.2.ebuild b/net-misc/omniORB/omniORB-4.2.2.ebuild
index 11410f97fd72..62f67c23cdc9 100644
--- a/net-misc/omniORB/omniORB-4.2.2.ebuild
+++ b/net-misc/omniORB/omniORB-4.2.2.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 # consistency we have to force it to use one that we specify. The
 # highest version the configure script will accept is python-3.3, but
 # that's on it's way out, so we prefer to stick with python-2.7 for now.
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 1a78ed58e478..a66d9b5a5d1d 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,9 +1,11 @@
+AUX openntpd-6.2p3-fno-common.patch 2084 BLAKE2B 3fbff2d88260f7dc5435c8f1ab7df1652842a48ba3a91eb9744b501e7a0f59a30d8af3d6d17f67bd0313cfc06588dd2fb7f449009b29ac8ac34de1744b997669 SHA512 00e5da8345d2deb2311dd15ac4800674329b182d0742021b2b746af49055a514684ec3872dffb337c8b7e8b3cc8126182530565241c5c223083cd99fd509aeeb
 AUX openntpd.conf.d-20080406-r6 255 BLAKE2B cdbfd0de5a238216efbf64c8ef9c5db891380d7352dd0864e631816411954e9b335b715f8bf6b66f0f2ce0c6f050e4c166b946f1d235509a130fc024c5b960b7 SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059
 AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f01bfd112bdeab3f7199775237c92726120ba7763f5584a21c4b3b18d7b27c4c28311202ee9c18b9259b0e853ee24d SHA512 eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 EBUILD openntpd-6.0_p1.ebuild 2964 BLAKE2B 3c46ec39de60ac3b58f52b23f3c196077e6bcd2e0c05f5f1f8a218d4a0b64ee87d00db003b2913939df7bcdd5558c2e9c054ecb11cfd648697080e047876ca94 SHA512 b211e867e39bd9b0a52c43cab7f33aece4ca257c18b50d50f3c73a4d87b1d5fb06f3f2a20e55a3c7628d66d12e23fad0740457d5099188f2c06231b7598f1fc7
-EBUILD openntpd-6.2_p3-r1.ebuild 1824 BLAKE2B 80b4a5cf3a6b6056ffe20a50c903d5375efeecb5928e53fff99d451e32b07dde34f2d96f8d0cae9c3079ab305356b57c7ed357947e88ea989ce5fef3729bcfa7 SHA512 a9a99e0441b7dfd7278dce5ffe2f531055a02780e8ee60371b82d33f7fb51a3699cde093cf1e841e928263d373495830603315add6262d0873a4735427cb47e6
+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.ebuild 3135 BLAKE2B ad1cf55027141cfe2e571788802f92844f2792d21dc551119760a72de2b7e41cef7aed7028e1071866de828f9cd5b70cb8a214cb16d87b2db26b9147102d7ee7 SHA512 c2f99c14eff42f9ad674b45636cb7b28686adee52d5037a79694356d18770c6d2d9766eece06efe99272f13356bd944b76db650420c9ed1069ca726c6c9cad8a
 MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
diff --git a/net-misc/openntpd/files/openntpd-6.2p3-fno-common.patch b/net-misc/openntpd/files/openntpd-6.2p3-fno-common.patch
new file mode 100644
index 000000000000..2a696f2fb384
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd-6.2p3-fno-common.patch
@@ -0,0 +1,60 @@
+diff -u -r openntpd-6.2p3-orig/include/sys/types.h openntpd-6.2p3/include/sys/types.h
+--- openntpd-6.2p3-orig/include/sys/types.h	2017-10-23 05:15:41.000000000 -0700
++++ openntpd-6.2p3/include/sys/types.h	2020-05-05 19:57:57.039447282 -0700
+@@ -22,6 +22,10 @@
+ # define __bounded__(x, y, z)
+ #endif
+ 
++#if !defined(HAVE_ATTRIBUTE__PACKED) && !defined(__packed)
++# define __packed	__attribute__((__packed__))
++#endif
++
+ /*
+  * Define BSD-style unsigned bits types for systems that do not have them.
+  */
+diff -u -r openntpd-6.2p3-orig/src/ntp.c openntpd-6.2p3/src/ntp.c
+--- openntpd-6.2p3-orig/src/ntp.c	2017-06-19 06:23:10.000000000 -0700
++++ openntpd-6.2p3/src/ntp.c	2020-05-05 19:55:01.041306344 -0700
+@@ -42,7 +42,7 @@
+ 
+ volatile sig_atomic_t	 ntp_quit = 0;
+ struct imsgbuf		*ibuf_main;
+-struct imsgbuf		*ibuf_dns;
++static struct imsgbuf	*ibuf_dns;
+ struct ntpd_conf	*conf;
+ struct ctl_conns	 ctl_conns;
+ u_int			 peer_cnt;
+diff -u -r openntpd-6.2p3-orig/src/ntp_dns.c openntpd-6.2p3/src/ntp_dns.c
+--- openntpd-6.2p3-orig/src/ntp_dns.c	2017-06-19 06:23:10.000000000 -0700
++++ openntpd-6.2p3/src/ntp_dns.c	2020-05-05 19:55:30.325662563 -0700
+@@ -33,7 +33,7 @@
+ #include "ntpd.h"
+ 
+ volatile sig_atomic_t	 quit_dns = 0;
+-struct imsgbuf		*ibuf_dns;
++static struct imsgbuf	*ibuf_dns;
+ 
+ void	sighdlr_dns(int);
+ int	dns_dispatch_imsg(void);
+diff -u -r openntpd-6.2p3-orig/src/parse.c openntpd-6.2p3/src/parse.c
+--- openntpd-6.2p3-orig/src/parse.c	2017-10-30 01:57:56.000000000 -0700
++++ openntpd-6.2p3/src/parse.c	2020-05-05 19:55:56.505981067 -0700
+@@ -101,7 +101,6 @@
+ int		 lungetc(int);
+ int		 findeol(void);
+ 
+-struct ntpd_conf		*conf;
+ struct sockaddr_in		 query_addr4;
+ struct sockaddr_in6		 query_addr6;
+ 
+diff -u -r openntpd-6.2p3-orig/src/parse.y openntpd-6.2p3/src/parse.y
+--- openntpd-6.2p3-orig/src/parse.y	2017-10-30 01:57:40.000000000 -0700
++++ openntpd-6.2p3/src/parse.y	2020-05-05 19:55:51.504920219 -0700
+@@ -57,7 +57,6 @@
+ int		 lungetc(int);
+ int		 findeol(void);
+ 
+-struct ntpd_conf		*conf;
+ struct sockaddr_in		 query_addr4;
+ struct sockaddr_in6		 query_addr6;
+ 
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
index acec71efebaf..c9ce369a8c95 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3-r1.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/openntpd/openntpd-6.2_p3-r2.ebuild b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
new file mode 100644
index 000000000000..6f9c04133f6c
--- /dev/null
+++ b/net-misc/openntpd/openntpd-6.2_p3-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_P="${P/_p/p}"
+
+DESCRIPTION="Lightweight NTP server ported from OpenBSD"
+HOMEPAGE="http://www.openntpd.org/"
+SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libressl selinux"
+
+DEPEND="
+	!net-misc/ntp[-openntpd]
+	libressl? ( dev-libs/libressl:0= )"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/openntpd
+	acct-user/openntpd
+	selinux? ( sec-policy/selinux-ntp )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/openntpd-6.2p3-fno-common.patch"
+)
+
+src_prepare() {
+	default
+
+	# fix /run path
+	sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die
+	sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die
+
+	# fix ntpd.drift path
+	sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die
+	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
+
+	# fix default config to use gentoo pool
+	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
+
+	# disable constraint config if libressl not enabled
+	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
+}
+
+src_configure() {
+	econf \
+		--with-privsep-user=openntpd \
+		--with-privsep-path=/var/lib/openntpd/chroot \
+		$(use_enable libressl https-constraint)
+}
+
+src_install() {
+	default
+
+	rm -r "${ED}"/var || die
+
+	newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e680446d5867..aec0434bc753 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -19,7 +19,7 @@ AUX openssh-8.2_p1-X509-glue-12.4.2.patch 5118 BLAKE2B 6adb167f27a926ac591c023e0
 AUX openssh-8.2_p1-X509-glue-12.4.3.patch 5024 BLAKE2B 96568de2316e50d8390654aecbec7751eb9eb333b30fb30700161c626f93e97c5fb244d96baf32fa12d31760efdb10c80012f872412e90837f8b294082d7b087 SHA512 85c635ed067ec3c829fe4caee6bfe84e0f986f0513d744476e637c1af16af910604b879e6894300be1ce8a6a6e397149329e8fe09246e3654dcdef1ff44da4ed
 AUX openssh-8.2_p1-hpn-14.20-X509-glue.patch 4881 BLAKE2B 899065ef3b781e7e67ea630ff26ac8c3975073e9ef5b0cc345c6cee9fb2e45d2ff549b716a76211c88efb1e540ed7d79c4467e0342cfbea64fef8e6cafddac85 SHA512 d37d4fd8614bed8b1592697b911a04e2ca7d14d24e9c315a6695b4c88cdb5b4ae980e8cb68040fe54b4587675ebb3ac5694ea0d09093f8451aa65e427b6a5d95
 AUX openssh-8.2_p1-hpn-14.20-glue.patch 5294 BLAKE2B 6a778eab95e05d371fd92a02f96b926cec5c6ff90dea36065b4857ddf243b5f95bb25aa339fddb1c662b628f26d0c11858d1ca0badece0a7268d6a51e99a09be SHA512 50289c60df01a59f134a0b283ec21d6a06beccdb68de67a46b4e0e9a9bc47855b0e4dbed47300c2f042f2eb9f63e4d6d0683f3092ee358a82e9d6337a3b173fe
-AUX openssh-8.2_p1-hpn-14.20-libressl.patch 755 BLAKE2B 55a8082d3dda7e94bdfe772001487e897625a074d23d2041aea660c41e7aa2de1d14ba1a0e7146181d8159293ec896c133205a55d722f49e9a03e5bf99ba7473 SHA512 ce2038f57017375d02cb55ec6c65e6c5276c161c20a5987178003d57282fa44268ac3abe1acd2d1342ba00d125bb50945ca483c7ebd5de6feeac5f8c6f3f0e1e
+AUX openssh-8.2_p1-hpn-14.20-libressl.patch 794 BLAKE2B 36e42916a90aeb857eb7b9bc815a2720b4fad82ebcb1b53b7045f5c61f1dadfcdb4478092c5ab514d0d11832696cbb54acc18c01e5daa41eea776962065f7467 SHA512 d41e48a70f6b3b293c07f42f764dea810ed3084e54821004f97e2e5fbc1ce7110e68632fd3492779b1ec62179a3f7e34e92554c735f825952e0ce1a05fd9d474
 AUX openssh-8.2_p1-hpn-14.20-sctp-glue.patch 755 BLAKE2B 091a7cf60907c142d28b7f20a9fe4e1db8f2ce7f268ea4e0f206de89ea4ce560e82c2e91a9281a664868628426ad8c262667b7e6ad4e35247422937b98034855 SHA512 cff282e6a35a109794fca25b724b8e5024e7ded07b5dd3646489f384bdd5a42726d7cf9f814b8ebc20caed02a1a70d80e0396626bdfc13302096e15c11433dde
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
@@ -44,4 +44,4 @@ DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e
 EBUILD openssh-8.1_p1-r3.ebuild 16430 BLAKE2B 5f87ff43f472c467a8e4dc359556b970a2d9889d45d5eb09c5eac5c0d245027764ec4d6b99853baaf7324883e5be426e20515b53f48fcc7a445a05e84fb0edde SHA512 e07cf259d7a6476c5efa4db22710bd533f86188bd1f5139e2c306858dd67e3b2a83cf5c9236c9441171e25af20a14e9f1d04aa058020ac9a20e0b0d6e7d8d89d
 EBUILD openssh-8.2_p1-r5.ebuild 16798 BLAKE2B 03dd8a663c89cb2185188a0fa9f72af49def3f44a9eaaa989c95f8b2812aab7a335547ff9d22edf64522576a04705e1f957d0edfe2ecf397df760f077eb846c5 SHA512 2a1714d7c8fa18a7b3bf5333625773e2125ca21dd3096766aad341663510503276db61fa42b9cc99d0531b4fcc55ae81e31c47de7502f7c2d83bdb49b91f1448
 EBUILD openssh-8.2_p1-r6.ebuild 16856 BLAKE2B f2e13e4cf7dd8f5fa5413bf66fb78116c27dc578b3a1f3368e288b26aea5a90d3e19f8a347e79d460935123169c95583c379c9db1ed352af54ed34991d02ad43 SHA512 e9bf2cda73df7d5b5a38e0ef9ce907a9be9fdeeb871e47d80809773e4119664dd42277f0d8016f4e77ae486750540c52fbdf0712fdecbac919b282a25d1e493c
-MISC metadata.xml 2217 BLAKE2B 8a0d058b1177dc662b4136e53242e13b84d0dc46ae60a50d358dbbf03267089489c51e0a7332459e602c7198bda66e28e6886ef924b295f0f8648eae9f4e21d2 SHA512 a2a76c6948540615a71b75fe86cf55ada9aa1efdc1f6692665d33fe531fec10babc3a234b8b262a963ce0b3cdda00a5a34abcbe6e4d9bf1cce936a5e4d2ac7e1
+MISC metadata.xml 2009 BLAKE2B de9bc08ceda797610a3910f79fc382a40c3129fec66b65675e008c649f8dd7341ef12b4391136e0e0d036699ed98fe23d7b3def941cb26cd299a17408e469830 SHA512 b72696b307f01cfe3b4ccf746450fbd15d0e64436fe7668c936c1f902522df68218314d494254d8e5403dcb1ffc79a52e64212b6c49b0e464754875112048544
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
index aa6eea44107e..69dd22a5eeb6 100644
--- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
+++ b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch
@@ -5,7 +5,7 @@
  +evp_aes_ctr_mt(void)
  +{
 -+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL
-++# if OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)
+++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER)
  +	static EVP_CIPHER *aes_ctr;
  +	aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/);
  +	EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE);
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index bc9c3e6e16dc..2a8ac0609ece 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -5,10 +5,6 @@
     <email>base-system@gentoo.org</email>
     <name>Gentoo Base System</name>
   </maintainer>
-  <maintainer type="person">
-    <email>robbat2@gentoo.org</email>
-    <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
-  </maintainer>
   <longdescription>
 OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that 
 increasing numbers of people on the Internet are coming to rely on. Many users of telnet, 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 9a551decac3f..3d67d1d6ab10 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -16,5 +16,5 @@ DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564f
 DIST openvswitch-2.13.0.tar.gz 7233892 BLAKE2B 66dfeb8a5dd61538360b319cfccbe49273298d6cb20df2105d1db7eb4d01f40d54ec8792a7f80d9ffc767f9b28ae09fee6aa76ac3d97be6fc43f3e7f3b2a63bd SHA512 3fcd15d07925273e0c45e6b1e70b2cd9998f753e8d1a11fd0de1d1511ad56dfddedbba436bb1c347b4afb84eb9cd6fc52c3d445b710a89d599d2ff47ed46f17c
 EBUILD openvswitch-2.10.2.ebuild 4396 BLAKE2B 842b1b82753a3b970bcd22848e45d63997546229bb5551a38aaf7f20affdfb71a17fb7bd4b8036e7bc108be6b556f7a630597b63a75f550a2727bb3785f98aa2 SHA512 9bb48966b9fb99d11ec01de2ffd924353a0fef145edeb021ce267708df91c64d57546618a66470494ebbcb950127f5f0cc88f6609004c7f330daa838fbc6b360
 EBUILD openvswitch-2.11.1-r1.ebuild 4480 BLAKE2B 8470a55f5ad20de6dc3c241e19eb0fda32f665eb90f8dc1cbbc0aecca603b902b3eaad696533c00b05b8aa3cc87d2491e31b91ffe5e44b255706a1705c16b90b SHA512 908cba577cab3fcf7abed4f5c277ae3845855ca857704948caa9c7ba3029a2722c8bdb020cf71cedd9cbfe19af94035f325f8a03ca7eecb48ba42d871cd851fe
-EBUILD openvswitch-2.13.0.ebuild 4407 BLAKE2B 33b9c71f4b9b4cedafce52450f32623236c17ee63ffab9849e5fdc7059d188fc9ec38e63977ba92cc798eab517dd457e4e266213f2c4981f17091c1407426042 SHA512 50e07b4c7948ca976ed4b88ef8f930e04f78a63fb29c111767d338930ef39c53cead19be8c234410888e0c15cfb7f242aee66cf61f7c01e6869a73c528d4646f
+EBUILD openvswitch-2.13.0.ebuild 4406 BLAKE2B b06beaded1293f17fcce6e753ebe5e13af064123305cc692b05b57556f971e98dcc821297f46344b79339fb3727318fd8b5641ae627dacc16f80e5135ca10d06 SHA512 2ab26767f98441655658ed2498915232148bc4ddba88f184071c84abf79d1507b6b5dab2d7ea54360c2f1ddea1c0e93ae6481c30aae22d334c9ec33648b0e74a
 MISC metadata.xml 458 BLAKE2B 52809b1a9ff6c0e69988e6e17cfe34145abcbe45c9d08e94f7fcc79e4ef72aeeaf2485349a04e16190c25c5b5cd61848253f5f63f1a50bf10e63918cae2ee1fa SHA512 080e0b3bbdc520573998377b41b08ca9ef0b049affb093fd98cc8af1d33c3c18a341a158ab3cf426a15641671018abf9f4a20734508276bbc88882b9f27eec36
diff --git a/net-misc/openvswitch/openvswitch-2.13.0.ebuild b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
index cf9fdf94575b..d55555327d0d 100644
--- a/net-misc/openvswitch/openvswitch-2.13.0.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug modules monitor +ssl"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index 05d574546d44..e5b14cf8d159 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,7 +1,8 @@
 AUX proxytunnel-1.9.1-gcc-10.patch 4076 BLAKE2B 13dcff92f5c440430b03b02abd2d3068fa1b95cd67d5830ab99ac077ca24b333dbfd7423d37c7e6cba8d92f820cc7c1ea5d407ac12f3ddd367fe48519113a310 SHA512 c031b884ee929cdae87fb03846a6f0a99b38fbea96c3fbbe94bd176d873e73a15f1a914795f85c9fb6cd107ec117e38dbce93a6aaa256ca516b41a0bd74f6929
 AUX proxytunnel-allowTLS.patch 592 BLAKE2B 2c48bb1a1c2e2374043d9bc73e653a5f87f5bbda6a64a5572cbe3bdafe533205f619b7248c8f7b6cecf7de8c72940a6ccf64e054c5419e9ba656f773e9d7d346 SHA512 67b0103054c56c69cd9c0d1aa144498151f105004b400bcdbbb3df519d37424630554e101e5617faf075fd978edddfc4d06cca7524c51e28cd33c1165b6a22f9
+DIST proxytunnel-1.10.20200507.tar.gz 52286 BLAKE2B fca86840c4240137e6cf92a289344c39a8ab4066fb3efe83007ea75c9e42ebd746ce3e326d2351af38ac580c18d139a8d4f956af828862ae4f4e89eb3bd19fa0 SHA512 8727a686dcca9e38e5327207f29824daeddf9ce9a4fccdef6c6bd41019eb3901d4b84e724cbf9ba615115151ea434a597e9290ce302ba6df41e99d2f0b484e01
 DIST proxytunnel-1.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc
-EBUILD proxytunnel-1.9.1-r1.ebuild 1041 BLAKE2B 7072f019baf871beffa674905ed05722d3b855576fff340f34eaa9521bbd524cec6122638d0d3882da4d1467ec7f1563add4a48767ee754ee79145129e58ec06 SHA512 de030c72e712b5c506d6f5fb47512f61451ac141ac3eb6cf17d3913650c79d2a6c898275b847051426bc9be9db4abc7249c387de6a3f44738dfffa8c059791cd
+EBUILD proxytunnel-1.10.20200507.ebuild 1093 BLAKE2B d62c614f964611b73c75cbd5db3752d1d837347de68f7aaa868aa943f386c4d4c77b0de6b620ddeaf47694d74ff96c1dfb812384fd18cd8ec74f691fb3c1af8a SHA512 054fe9d19722ee2081a89fbd6f372404f4f26ce5d27ce8110dc82452eb7fedf8c96a6b7c7b4e5a498ffb3c5c0569cb1a326ba2d64529f00ba2f26075d3ed047e
 EBUILD proxytunnel-1.9.1-r2.ebuild 1173 BLAKE2B 4402bd59cd3d1e967577fe65274347e6630553491850c87417d667eb7ec2a403782ddc3d31aa7dcbb302c490e3a73e19eadff9f418456741cd36be3ea9631125 SHA512 9e395e52a362684eae2c0ec6003e1e193cfb4d539173fc117352162601c85bc8d56214e320a5b7440394b20deded395fb5d50c43497bede6f8c144958dc37a2c
-EBUILD proxytunnel-9999.ebuild 1092 BLAKE2B 18e6074c8f467ab5f6f409775761b2be8c9d80515682e4a014b76e6d1b33bda791735d6b5974db97a7bfbd5fb6ec1f4f910d8687e0fcf39b026dafabab81c1e3 SHA512 e486dd5ceb3b4aa6d80be955640525b6edefb03df09e7d4d356d2510d11b2831e1ec0cd30935b998a95e8de6fe7b0d38af08d15aea6bd5c2f3078a196885ea55
+EBUILD proxytunnel-9999.ebuild 1093 BLAKE2B d62c614f964611b73c75cbd5db3752d1d837347de68f7aaa868aa943f386c4d4c77b0de6b620ddeaf47694d74ff96c1dfb812384fd18cd8ec74f691fb3c1af8a SHA512 054fe9d19722ee2081a89fbd6f372404f4f26ce5d27ce8110dc82452eb7fedf8c96a6b7c7b4e5a498ffb3c5c0569cb1a326ba2d64529f00ba2f26075d3ed047e
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild b/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild
new file mode 100644
index 000000000000..cbc33dfb1f68
--- /dev/null
+++ b/net-misc/proxytunnel/proxytunnel-1.10.20200507.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Connect stdin and stdout to a server via an HTTPS proxy"
+HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ https://proxytunnel.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static"
+
+RDEPEND="dev-libs/openssl:="
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+src_prepare() {
+	default
+	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
+	einstalldocs
+}
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild
deleted file mode 100644
index 64fea4ae5b4a..000000000000
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-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"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Connect stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy"
-HOMEPAGE="https://github.com/proxytunnel/proxytunnel/ http://proxytunnel.sourceforge.net/"
-SRC_URI="https://github.com/proxytunnel/proxytunnel/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="static"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc
-	app-text/xmlto
-	"
-
-src_prepare() {
-	sed -i -e 's/libssl/libssl libcrypto/' Makefile || die "Sed failed!"
-	epatch "${FILESDIR}"/${PN}-allowTLS.patch
-}
-
-src_compile() {
-	use static && append-ldflags -static
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install prefix="${EPREFIX}"/usr DESTDIR="${D}"
-	dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO
-}
diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild
index dff3deb21c61..cbc33dfb1f68 100644
--- a/net-misc/proxytunnel/proxytunnel-9999.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 8402ff1da9e8..21a7a408c17d 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,5 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
 DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
-EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1988 BLAKE2B 07014a92a0feefd1902bb7c023dfb01081109b9b243482071cb9b327f176590616fb78f9bb41f577ce54fa6e8c63a89ac78b442a72f99ea7af2232f1e84d2c92 SHA512 477e5dfac0a8a2130e58811180c70ee681ef69350d8372f891c5235ba2c441d1bdf00a540c9a3eaaae733bad7f3c6937ace411bce5e1107b7e1cba2f18ca4c38
-EBUILD pulseaudio-dlna-9999.ebuild 2116 BLAKE2B f912ad135fd58c1584304d2b3fb352ea997bc89784d3f91c839db051674dd6da3fe55ef194a610013479b099727adb073c7e3b27aa90f4728bab7ed4c314ea60 SHA512 dea99662045c76c7428f8a53d0c4aaeef6aa768b2f47a9ea244de3bd9607ac20345df274377591e4307259ce4841561326271598391cc09308953d70cbe42807
+EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1940 BLAKE2B 9de7203fb0ea530d8b1fb89ec3de2a4e97dc0896eb9df661031b2a56f7c2b3d245aea59e5c0fdaf91c7ac68610e45931f060ebdf3ae1537d95d5c7afa82f06ed SHA512 8423ba3cb4ab16a8d417f0f50306fb24accdae645de84bac9cab728d35dbd7eda2f0e7beea489835f94cf1e4ce88a72522ec46d6bb6da554a7bb364d9c24a0fd
+EBUILD pulseaudio-dlna-9999.ebuild 2070 BLAKE2B f190a5da410708cd165a6f3d4df294402e08a246e2e563f1633a775e7c47ab9acd0e69caa5af416f51ec40de37d69436a025af80ca82ca5b9ee129fc74fd298e SHA512 2851a6411be0f6ceb83e153642a15b44a3aab585d01513ae53a4a73d9835a886a2bb493152dbdf5eda3c54907b2aa4eded2ff95259a51fadb11d55e4c6920f69
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
index b82c8ca45012..74777d29cf6d 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
@@ -37,13 +37,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	|| (
 		|| (
 			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		( media-video/libav[encode,faac,mp3,opus,vorbis] )
-		( media-libs/faac
+		(
+			media-libs/faac
 			media-libs/flac
 			media-sound/lame
 			media-sound/opus-tools
 			media-sound/sox
-			media-sound/vorbis-tools )
+			media-sound/vorbis-tools
+		)
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 09bcb5e33204..e40690d4ccb3 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -44,14 +44,16 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	|| (
 		|| (
 			media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
-			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		( media-video/libav[encode,faac,mp3,opus,vorbis] )
-		( media-libs/faac
+			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
+		)
+		(
+			media-libs/faac
 			media-libs/flac
 			media-sound/lame
 			media-sound/opus-tools
 			media-sound/sox
-			media-sound/vorbis-tools )
+			media-sound/vorbis-tools
+		)
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index c4dac938f05f..d9ef29d63150 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -11,5 +11,6 @@ DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3
 EBUILD radvd-2.14.ebuild 1753 BLAKE2B 7b78a71a957572ab3680c901174e63b142671998f77f9f0211ad0ed85fc39864f43ce074e7e5111e4f942d27b2f5448188bff7595b7951cdaac3cc7588ed6478 SHA512 cad3e22ac355c612b578634f0d3a5feaf54910ed86494c503d3df016a7831fd299c6530159c6a1caf06d2c93bb70461cc46db35f32d62f19f6961846b31c8782
 EBUILD radvd-2.17-r1.ebuild 1562 BLAKE2B 75040b986dbbe14656b4ab69aba82c99d2b85b6ca8f5968fa363bc123cb09acfea1d2864a8a2ded6ed767941e552ffdce7c77ecbe032c313e480003eb4304996 SHA512 fd3f2fe16b9f726a2d42bd3dd6abdf6d42fb62f58b48bbb375cb8a4f6e010247b2ea447b7f378e421cca2ec319d5ea2a0150a78ddf7aaabd5488ca467607e4da
 EBUILD radvd-2.17-r2.ebuild 1618 BLAKE2B 05259d6d5c99d5cc261e750a99dbaa42bbc96f40cb9e7d601ad0795dfab99fc345910d1be7462704f7c190bcfeb37dec3ffe5439f46cb4c27fe3770f986fe5f7 SHA512 d08531d71eb7129ad205104fa2dd3ef6fbaae3ecc309beab55affbaca4974a6b1b90c3db4891852970fe7260be7d9a8b1d5c816fe4b3dc303d2b118d6802e83f
+EBUILD radvd-2.18-r1.ebuild 1647 BLAKE2B 364c3fedeeae8a531fd53dfbb7590901c202cf9bd13d36e29301ffc52c93bf2f1bdfaa05936de43b4578ef02a8728a100915af0f04b4639bc435ddc2be195933 SHA512 06a1d255577bfa41b2cf3e56ecf6eeb848c040677c6a47d5f5f34590f211a70b057a77dcd1631ccd21af7301283a2a5d7891d7079916ea548d2d8cdb30feeffc
 EBUILD radvd-2.18.ebuild 1581 BLAKE2B cba81555264383d7682e69c77e9317c6b92db706787fded138a9e13617ebc3665de580cc62821c0f7872a84f7e982253b0d271ca51cc9b2e466af6e9f2f66ae3 SHA512 aa74a54a89ff5a3047d1c8c4e8abc247cb3f50d845a0d40dadeedf4202dd9972b895e5ab4691150aa5d9bc4a77b16c2c3c94582fac299e5cbc45d0b638cae7f7
 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.18-r1.ebuild b/net-misc/radvd/radvd-2.18-r1.ebuild
new file mode 100644
index 000000000000..44a31097acb0
--- /dev/null
+++ b/net-misc/radvd/radvd-2.18-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user eutils readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="http://v6web.litech.org/radvd/"
+SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="kernel_FreeBSD selinux test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-libs/libdaemon"
+DEPEND="${CDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-radvd )
+"
+DOCS=( CHANGES README TODO radvd.conf.example )
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup radvd
+	enewuser radvd -1 -1 /dev/null radvd
+}
+
+src_configure() {
+	econf --with-pidfile=/run/radvd/radvd.pid \
+		--with-systemdsystemunitdir=no \
+		$(use_with test check)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/doc/${PF}/html
+	doins INTRO.html
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	if use kernel_FreeBSD ; then
+		sed -i -e \
+			's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
+			"${D}"/etc/init.d/${PN} || die
+	fi
+
+	readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf.
+See ${ROOT}usr/share/doc/${PF} for an example.
+
+grsecurity users should allow a specific group to read /proc
+and add the radvd user to that group, otherwise radvd may
+segfault on startup."
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 5bcb2dcb09e1..79f33df20d64 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.36.2.tar.xz 4057356 BLAKE2B 3ff1a0df12cdda694ded3a9a5c6d1495eaf0dff7133cbc84b73ad6bc767cd3a5e31ff8b579aff9c0de455f149e49dc972f7d93d64424d25501b02f2a02f66552 SHA512 8c079f83a00c9ad237b634e6274d27acc94a91adfa2829f0336b2485aa801e6898c30ec7268352247f1d12232d9ab3cb7a6f8215370f03aaff5323c4a8fdff7f
 DIST rygel-0.38.3.tar.xz 4106460 BLAKE2B 38547cd28b0039440cf5e4a7381914c606479c1f26f91eb8af14276a6aa7d6267f0fba5b2af374ca3f0b933c683d569e26cbcec8cbdd15d620d57bd1ecf32c48 SHA512 787508f809e473dccc8461128c1b3b9d71b118008fa13660144f32ccb4b1ad02f41866ddf00343e102ed6f13552d34278917e14cf50c57ea3ffb6cf474f0ce58
-EBUILD rygel-0.36.2.ebuild 2198 BLAKE2B 75df8d49a81628fc87bc183215d0205c103ea28ff55d139545e6441af846385d7a03799bf534235def840f427c261f303f10dbe4a59e1d78602aaf14d865409c SHA512 f625d54e543ba7e09545b7b87a8cdd7fcccf4ec6a2a1f766269ae1e8019ad93940fec3a77c041bac2add5dbe578b73f4391acbc9b6e41b2d612e2a5e539a1b3f
 EBUILD rygel-0.38.3.ebuild 2209 BLAKE2B 7e40c88afe41dadb3ecdd5469688436b015bdd5f43651f904bac5f682cc77a9e4579505861533f346d73f747251d81e5545cafcae7fb4f8cb73870c48d560006 SHA512 7d50000a2b16ecd28cb5a4f69b7e6280f741e74f5e935296008de23df9865479a0e6bead86b096514c3dac4150fbbbd20d96c407d2720acb5cf5b2038a81abc3
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.36.2.ebuild b/net-misc/rygel/rygel-0.36.2.ebuild
deleted file mode 100644
index f97d1762808b..000000000000
--- a/net-misc/rygel/rygel-0.36.2.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.40.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.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmediaart-0.7:2.0
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-0.14.15:0/3
-	>=net-libs/gupnp-0.20.14:0/4
-	>=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: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.22
-#   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/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index d3f7ed878c00..77a16a9fb993 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -2,6 +2,6 @@ DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f6
 DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
-EBUILD s3cmd-2.0.0.ebuild 575 BLAKE2B 0ac4b05535936839fe7372c6fbd1666fc9a45e3a36b187c0700bfd411757e41f36b91b1165be6d5c420fb42acaee91d4831a83be24adace893427f678107edd1 SHA512 1b2fe00baae334592e94b83e557b92e0732846126287a368409f7b3c5288c09577e1489f911bef0aacb8833f16b6d535f22c4584bb610f40063e754849275389
-EBUILD s3cmd-2.0.2.ebuild 585 BLAKE2B 6b5477052f63aceb87b6fc2306f5faa8c15f27aa51fb3a9a580a9f3d291686ecc2e3805b44c500bbd5c74476622a68b79bc124b066cbb5584ff06f4cbf5721fe SHA512 cec95baf83099d46c5192b6c19fe972d41bbc591ee43ee495ddcf300a4dddab5bafcb3108950b3a031f5df103c2a2b38326930cef390cc13eabaa780b75934e3
+EBUILD s3cmd-2.0.0.ebuild 569 BLAKE2B 531a6555be566cbbe57325c6bd98cfb1bdffe32028addd89d67d72fe12d6dc66debf02acc58b061d53eff3a66af5488ca19a7b3eabeb6c71372629cbb32926b5 SHA512 4ecf2fa88755bc3d74a1a53960ad59dc31bde4dce32fc67babd92d6e6f5740d40e7b586d97e2a0bb4434b7a57103020f8b74e6ff4dac3a54fc5542b0bb966a03
+EBUILD s3cmd-2.0.2.ebuild 579 BLAKE2B 37142c3dbcb5ee3d9ddd574738fdd0df153e566949a0f1f7350b1ba2c02acd36e0a4398ba4683f12ab9392d86375a5e10adbf9b39d76a020e20e4b565af1b5ef SHA512 bfad562510e73393e0cb8ca22ca7b7853ed5a66b35105282eb6eeec1ccef38a0e051d45a62eb442b923148fd75a88259fda742cd28399fad9bfdaf31fe731775
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
index f6d2e14b15d5..49035b03c3ef 100644
--- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6}  )
+PYTHON_COMPAT=( python3_6  )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
index 9fb4d379607d..cfdb393490f2 100644
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6}  )
+PYTHON_COMPAT=( python3_6  )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index 1948959da979..65a8f909bdaa 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -4,6 +4,6 @@ DIST seafile-7.0.4.tar.gz 706114 BLAKE2B 8abcf24b752eac20e2abeb355c79d420c0cadb3
 DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
 EBUILD seafile-6.2.11.ebuild 1055 BLAKE2B 37f40dd27f04b6e422fc55200c1c60ec4e944127b7a24b4923617d7ceda36afacd89cac7aa5fe9ed31cbd35620fd2a5c49acf79c9eaaaadee00cd7b7dee17596 SHA512 e7e1f55163512d3c34c999b7b8c2fea18982306c90ccd4fd130757a6f37077cff30327eb73ea6a7187c30de5e2edad48cdc2a5169198e0ee9217facdd1a8cb70
 EBUILD seafile-7.0.2.ebuild 1056 BLAKE2B bb4f9535adca4ef40ac250e61cc1490bca4aa093c270c5d3a581c4a9347afa3781922cabd0ff41ed5ed9c292aaa83df971fc579e3d894cc9602132d510b29b43 SHA512 0b7c1369f2598bd648f9181c7c9f90ab3718ebc4a960990a8afdc0a1c52c26ca8901dc29abe5ff520ff7ad3b4996e837e02d84860b5b4b5865fab8905e7703f5
-EBUILD seafile-7.0.4.ebuild 1098 BLAKE2B 38c27930d6c7a8a3788b5386e989c0414a1cd3e9080f07b45de8dfe9919057b003bdef865b6702c04f7bac21d0f5f19dddbc26ce52cbf5ccaedfcd38480e3a36 SHA512 928fc119789b152beae6ff1c54d1736f40cbcdd69cb39174d905352ba37182e440283ace623ac7bc1948c4ac8fa12bb7b176ccd0a1f8a0f905723194b45fdac5
-EBUILD seafile-7.0.5-r1.ebuild 1075 BLAKE2B 4e877c79fe06723fd093d2975825b9bacc93541daac59fadd60ded97b7b720e84d50303c9c3e91bfd5389a903f67ffc7274227ed98af19ed4ff4ec74f95dc533 SHA512 f82df8ba2ef0a971f89650c8f3a63e3ccd2e7fca21f5cf7fb37ef4424f126d97a53729caa649d881ce8cd003da8a129a0cb68ad8d1feb11dffca98aac9dbe54c
+EBUILD seafile-7.0.4.ebuild 1092 BLAKE2B 3849b25793cd8e4499f57e123397f9d28bc521fa1d20f95cb8d1b23a3151348906210445554058da657712cfff26481a216e35472101fbd8bffaa945ff3874a9 SHA512 a083498e1956b51e1af7d7cdd2644e0a80635b26d07915777bf79a62f1a40191944876820dd71ad8ab9fcd3b0f1bb2d622af7e2bba9735dba9c84a1cbb4163e4
+EBUILD seafile-7.0.5-r1.ebuild 1069 BLAKE2B 01fc0d0ea194b0b4ce9376ec3d87c63c9237bad80d151589bd91a650179b4cbd09e5c8e99cf3cd80ba209de5152dd82be4f186052c9ce67e5d43e1f50c75d4e7 SHA512 baf5cdc631e12099493ffd0e65c88988ec0df5897fdc0903a1affbf56cfb1c0455da54e5e61a29e3cfce0eef107b03b8e4aa482d29407a7f2368c72b50b978c0
 MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
diff --git a/net-misc/seafile/seafile-7.0.4.ebuild b/net-misc/seafile/seafile-7.0.4.ebuild
index 1779236fefd9..6434ae64a9e1 100644
--- a/net-misc/seafile/seafile-7.0.4.ebuild
+++ b/net-misc/seafile/seafile-7.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit autotools python-single-r1 vala
 
diff --git a/net-misc/seafile/seafile-7.0.5-r1.ebuild b/net-misc/seafile/seafile-7.0.5-r1.ebuild
index 0ba1676a8c00..cff364fbb186 100644
--- a/net-misc/seafile/seafile-7.0.5-r1.ebuild
+++ b/net-misc/seafile/seafile-7.0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 WANT_AUTOMAKE=1.16
 
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 459b340dee2a..7ec1e4438cfc 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,6 +1,6 @@
 AUX smb4k-3.0.4-qt-5.15.patch 689 BLAKE2B 1c7d40e8dcbdc9b41380640b648860852bb8381b2f45d61a7d221f4ad7966c1e12f7cefb9c0a9bffc7a691ab97222f44f6fae587828c2bda7e395399c4fdef5d SHA512 f2f60e30991b24f68a9a84160ba935db4d20719e515cbb47eaf0576a3303bf1b549c1dd740cbb3a283eb03781820adef09199a1b9cf23f60c0b880483209ebd6
-DIST smb4k-3.0.3.tar.xz 3823612 BLAKE2B caebad4d818bbc99365541dbf9152bce17e55ba64cda6d23f663c326229d7d14246c6f385adf33a90f16ea206a9286220018810af2d7ca7f9f1f93fc571e1d7c SHA512 c517344c997aabac8158e0f2b51482adde6033ef13c3320b34a4de3462cbb3541068fb7cf90e73d39e7be3ca3f55c3a55a5804b1d1b277d9ec48e3ea06cb7181
 DIST smb4k-3.0.4.tar.xz 3824508 BLAKE2B 98d9e66a577e40e734421cf46d72ebf010fa1d2161d411dbd5382af8fd84f2578a086f0425e576508aed0ed549940cf4b7f688c527f42218dd781006d2460204 SHA512 bd3b53f6f8e9ee3dd6fc8c0ab31b877fc89a887837b7bd91eef410b6dff81960ada872bada074638c8b7d204c638564a70568e87cc874e146508241e071665a3
-EBUILD smb4k-3.0.3.ebuild 1886 BLAKE2B e3db0902dea23a31824f963850c243693aea932d8804a0f92126b072e790595e5d41e9a1b226c88fce83e0975e97c9b5183df8a69db9bb91caaed96672f280bb SHA512 76fd0d9aa5695751ef1fa43ad6add6613e515dc85e9537507fb2d0c313b66df0ce3544e2776b573fe20cc77ecca4e5685e1ca8c3cd5295dbaf81d6a8686d09ea
-EBUILD smb4k-3.0.4.ebuild 1934 BLAKE2B 4d708e0dab6867a4ad79e6f091352fd1fd0fdc70d1a22c97e2fca8a2e2eabee35e7bc7f4e0e892e1c023442c87c66e17932c45613284389711f45983c9112ba3 SHA512 8f0194fbb6816fe8c7cfc8bcb631c51cf386a258a46645f520249657f3638f40e86a1e213957f9cf9d35026f8530812f720aaa346e8dd34530b47e0f0567f86c
+DIST smb4k-3.0.5.tar.xz 3841924 BLAKE2B 98bc44ed33b60fb983db34d39ed7bd51f9fab8c4594e81c9f3d6275c4b6f49822902d12da59cb777754febd839c37d42d6623cb42ae03385a5187e063790a872 SHA512 913e69ba30b4d7294e4436648fcebd54173cc0c32a712824218aee7c276dc0d8eea0a2e4a14648cd55c99424b80512e01c5a1929ce38a9f83d3dfb9c24601af1
+EBUILD smb4k-3.0.4.ebuild 1932 BLAKE2B 38084c5e9420ade82d3ea8b245fee26c068e678724f38c5576d75cd4bc8652b6b7189d3466242fb8f90b800f8bf735dab4f4e3fa3120339dc5a00fda1e63eb31 SHA512 ec2d341b877717a47529096db938096f84a9b5d08802034a36c9bf9b403eff9eea8a28bff90d963d715f4ee63c6e28b4a2eda605fdcf9590281fc5b02726aa84
+EBUILD smb4k-3.0.5.ebuild 1888 BLAKE2B 4bd8f4e49305481f5c0522760f7e9b07daa2cc0234cfeaa28240eebe02c3d83462a6cfca13b7cfb191493c12b294896b1970a15155768f1635118fa8bd4fe9da SHA512 5e1f6b51eea2f35b9785c2885a23ed027a975d6afa41302d51568d3948f5bbf98b2c1fe09b81721d70fd8d03308d8c87a7c1da8982683c904a50bb51d79d5d01
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.4.ebuild b/net-misc/smb4k/smb4k-3.0.4.ebuild
index 3786a642748c..dfe247ddeca5 100644
--- a/net-misc/smb4k/smb4k-3.0.4.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.4.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/smb4k/smb4k-3.0.3.ebuild b/net-misc/smb4k/smb4k-3.0.5.ebuild
index 169b71b8637d..a7ff9e7f655d 100644
--- a/net-misc/smb4k/smb4k-3.0.3.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.5.ebuild
@@ -14,7 +14,7 @@ https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 7e3381f93f3a..7005643be507 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,6 +1,6 @@
 DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
-EBUILD streamlink-1.3.0-r1.ebuild 2054 BLAKE2B 82b5193323917654e45cd9de91245e4990e419d88e7824572a3b6bc9a12396ee2fe9d41063d1ec21b8c6bccd381af02214e070bd1b4f25be0531faac80b343a1 SHA512 60f6808b6c4d9323c9958166e2c14e6c73df941e7549ecbfde43bab4d93bb42f31a5f8342db3ac77b562e1c136d28fc2c58a3293692d154e922f62ece9fac6dd
-EBUILD streamlink-1.3.1.ebuild 2054 BLAKE2B 82b5193323917654e45cd9de91245e4990e419d88e7824572a3b6bc9a12396ee2fe9d41063d1ec21b8c6bccd381af02214e070bd1b4f25be0531faac80b343a1 SHA512 60f6808b6c4d9323c9958166e2c14e6c73df941e7549ecbfde43bab4d93bb42f31a5f8342db3ac77b562e1c136d28fc2c58a3293692d154e922f62ece9fac6dd
-EBUILD streamlink-9999.ebuild 2054 BLAKE2B 82b5193323917654e45cd9de91245e4990e419d88e7824572a3b6bc9a12396ee2fe9d41063d1ec21b8c6bccd381af02214e070bd1b4f25be0531faac80b343a1 SHA512 60f6808b6c4d9323c9958166e2c14e6c73df941e7549ecbfde43bab4d93bb42f31a5f8342db3ac77b562e1c136d28fc2c58a3293692d154e922f62ece9fac6dd
+EBUILD streamlink-1.3.0-r2.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
+EBUILD streamlink-1.3.1-r1.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
+EBUILD streamlink-9999.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.3.1.ebuild b/net-misc/streamlink/streamlink-1.3.0-r2.ebuild
index c55072c84f21..6f6674f9723b 100644
--- a/net-misc/streamlink/streamlink-1.3.1.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.0-r2.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	media-video/rtmpdump
-	virtual/ffmpeg
+	media-video/ffmpeg
 "
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/net-misc/streamlink/streamlink-1.3.0-r1.ebuild b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
index c55072c84f21..6f6674f9723b 100644
--- a/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
+++ b/net-misc/streamlink/streamlink-1.3.1-r1.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	media-video/rtmpdump
-	virtual/ffmpeg
+	media-video/ffmpeg
 "
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index c55072c84f21..6f6674f9723b 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	media-video/rtmpdump
-	virtual/ffmpeg
+	media-video/ffmpeg
 "
 BDEPEND="
 	$(python_gen_cond_dep '
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index ae2ac732a011..7ea10916adbb 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -6,7 +6,7 @@ AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
 DIST stunnel-5.55.tar.gz 986873 BLAKE2B feb3a7d80aa2f67e0b8de2cdd2a134947f0715cc09c2d2778cd2aef4dcc55ffef45c55e010bd6048f38b143d22006beb90c7b76575a8d6d3d430d1f87dd271fa SHA512 278e39e87e080171d2bed3b193f8f7923b48c12c6d788afeb113a71bfc6077129305e8f93f5e7046b12cc8aa381e89909358756c978ef129d3067ceeb60e112a
 DIST stunnel-5.56.tar.gz 981163 BLAKE2B eef5a535165b1346d14e8fdd25ded7f497378bb63ab7d68642c5e1b3db2716c8e46db443146385a192a7e6042adcca295a5b107912e113f3f13f66e7a8d8b00b SHA512 db1be82b80bd5606568c5565f1c9a5710d4f7abca2d89388daa441bc395aaf2be998ac6403c7a17b8af01b89ade825186c20c50f73a809f9d64eca2e1b57a877
-EBUILD stunnel-5.50-r1.ebuild 2792 BLAKE2B 7eace874dbbb8896c5f93a6cc82fd9a20ffc71398b7f071e86143f89fbe8508b8d0fdb23b09e65da7ff151eb8d6d5018064a2175ae9f51344add048451c81a97 SHA512 eceece617f4f3bff25e72fa15446fb94e0c1ca539ff5416d1841bb9c4cde401643141f1f6974f224398291a0a6c0171017161b6939e77eb4997bbdae2823ea0e
-EBUILD stunnel-5.55.ebuild 2774 BLAKE2B 21833f1fe61ef496bed6d99a8048a40575806ebd0a079c1a3f627cef6173906db28c97f0325b916f441063edbdc8b6e8d2237fc0e0ef1199f2b30d1f827f8e6b SHA512 5ad46c7fe4afcd433c4e9facea661b916ae472d48417462f3409dba3ff46d29c46466de0e5328165da19a63e393c1cda7c642d22e9bddc3798f9d16f2bc2466d
-EBUILD stunnel-5.56-r1.ebuild 2754 BLAKE2B c4a0442bc0c1f6c97d961961b986d3f30c92e8fd9062c3472c6a07f3095efdd5dce7585c10c27f827a6af9b1d1a525361b4d4b9d6a9d44e6c86ddecab1182c13 SHA512 1957ade6544b696fd993b2f94bf57543eadbccfadcf347ef3cb854895df624c3c3c6089dd3339bf12ef043e4c2a9cb0cc4ac1c3b8aeba8fc4331817756b87566
+EBUILD stunnel-5.50-r1.ebuild 2793 BLAKE2B 171534b2db1295d9a0f23664a43d5f01a45b113397c24c8e3e53484cd1fef30b609f3d696eb76ec57a3b2408c1f52e5755ab7e75b9669b247170dcb3b8790b81 SHA512 27a6c83a40b46a568091bffc0586fabbea86df217bca9f674156e08eeb15ff7443caecc78c678c33e0f10e69bcfaa8b4c36c08a72a147d66068013c3b43dd934
+EBUILD stunnel-5.55.ebuild 2775 BLAKE2B dfc2654573b38a777a90c8951de517016a933eed0493d3b529dd0b16e9f06e001e71f28ae18a78fe847c049072770614914c4b72ca4823648cabeb45e74d458b SHA512 ad9deb507a177d3d9a62db77d3ed35766a7b6d2a4f8ed3e193ae96fe6a80aae35a1a8a5c81082a9f439c1ac445279fa8f4b521bc202ce16c75816f8c06a52423
+EBUILD stunnel-5.56-r1.ebuild 2755 BLAKE2B 519d47e87b6b80df3b32c057629c3ac8cc25d6c9e761665d272a708d0770c0b90aaba02caed060096ae3fcade304638022103a277886a1ac0219e615e45cdecb SHA512 98701fce9d7a7a35f2dc6fa843b5a7caad9e1a008f62319e8085c6bd0c0ec90b5314d260486d9eed70636e2a96e2529d4b5dee72d642c9326dbda0626fcc42b2
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 7b5858d832fc..7a02d027adc7 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit ssl-cert multilib systemd user
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
+HOMEPAGE="https://www.stunnel.org/index.html"
 SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
diff --git a/net-misc/stunnel/stunnel-5.55.ebuild b/net-misc/stunnel/stunnel-5.55.ebuild
index f1faaae643f2..aa852ad78232 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -6,7 +6,7 @@ EAPI="6"
 inherit ssl-cert multilib systemd user
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
+HOMEPAGE="https://www.stunnel.org/index.html"
 SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index 667f8f567387..10f5581fa01a 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-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"
@@ -6,7 +6,7 @@ EAPI="7"
 inherit ssl-cert multilib systemd
 
 DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
+HOMEPAGE="https://www.stunnel.org/index.html"
 SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 8ff1cd834215..48b263c51be1 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -9,9 +9,12 @@ DIST teamviewer_15.3.2682_amd64.tar.xz 13066268 BLAKE2B 701a1c53486b186ebdeee8c4
 DIST teamviewer_15.3.2682_i386.tar.xz 13602852 BLAKE2B 4a3ec9062dd2c670395953bdcc5beb923e37ed00ee315c1a051d10b15e16dfe9fcf00f6b1308180a007257edff931c9a210da4b8520963f2ef0df9406e27b9e8 SHA512 bc599059f5d2b9178db39c1d9cb55303493bd734642bc0aecceb8bbe025056a4a61a50055cfb4ed5841787bdf41a6c544603cde13a724f737677d0710157f077
 DIST teamviewer_15.4.4445_amd64.tar.xz 13056296 BLAKE2B f96bfa24fecec42cd591db8e1e4c471d02fa3de927169e449689507694d162d9b2dd0dce252699c81d18a83a5d58f33f70189cfe824e5388b391ed9b198b4459 SHA512 1fc2ff655f7455d3b11a913ef2342539c5845e0490f26c51e9cb4437185b1d0bd4371c9be3b8c4931ee0f1e97c59bbd06414788af6f8cce80579edf2e11a53b7
 DIST teamviewer_15.4.4445_i386.tar.xz 13631276 BLAKE2B f836e68c96d5b0e05c7033504c4b3624d7ab4eed4e0506535ab23e18d2611a506cdc57128bca1b27db3ecb8d4dcdda917f74deacefdd52a0ffc5626417ce62c6 SHA512 d4181241f2732310e9cb2fb7cfda3b9679b26bd9c11a8934d5c528878cb703611b86d95edb44e928b72ee5c127888aa7e27a466698d1ca5515e2a1077a921d52
+DIST teamviewer_15.5.3_amd64.tar.xz 13028200 BLAKE2B 12eec74d2e737d8d091fa100f3a6ff56926257ddd7757f649d2acaacac55c29724690a9bc52bef9c9b966692f8d28d352dc5002b815b4b7e3fd535bb1b250105 SHA512 36a758759e1f0ebfc1e7cd559d5326f51704307373a96d4df1fae5d4e467cd638a9d2c7f4d40c7b2ad47ec4fc66e0f5b432596569b2226d92c18abe67ab01b50
+DIST teamviewer_15.5.3_i386.tar.xz 13562544 BLAKE2B 55d16574968943ae5dd52d523b63ceadd1f74ec7a4440dc476e6498bb3c05cda395524af4d4d4b3b1b94eae5ea22b70bc91ee63c27be90986589d7a8ec50393e SHA512 4022d179aedf8050ddb07f6ae44cac1a08f8f3e8a3b2593c2c3d97ba87f02d6b24db0247b173f64f38ed6128b148c025e0941e2695cf5fdbb443768e93dfd797
 EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
 EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
 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
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/teamviewer-15.5.3.ebuild b/net-misc/teamviewer/teamviewer-15.5.3.ebuild
new file mode 100644
index 000000000000..3441acea1e60
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.5.3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+	elog
+	elog "Most likely TeamViewer will work normally only on systems with systemd"
+	elog "or elogind. See this thread for additional info:"
+	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index d17a96ca3cd9..8830caabaed9 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -3,6 +3,5 @@ AUX CVE-2018-7225.patch 2397 BLAKE2B 2adae0915f8ab5046b80d30b9e1ad7ae923ddc01c92
 AUX CVE-2019-15681.patch 950 BLAKE2B 5c45bd813ef1329ebec3486fd5464df510d72f52172cd0b6ce9aeebb06685e33500df3f2e335a882067e0aa1b8db4f9307aba04879b91e4b6b04071a50e9551a SHA512 4e9e638b12970ccac3ffd85135cc93a943ec30a9d73797fda4e8403a464e6f63870b28f6f1dfa27d959a5703068cc53287112b1d4d85682edf7161b300951a61
 DIST vino-3.22.0-patchset.tar.xz 158480 BLAKE2B fb8b50abde8cb4728410302c1d3a57bc4d344a33ac0bd9f1265fd24eb142dcd52e870845b902c9b63e98134f87873ebf6abfcfcd1efadb72b0cc72b04f9bf4be SHA512 cf96f5dce96d5c060462698c9d8df6f6d94eb9d624cb689c1262830840ed8f3617485f2274832076c273625e92a89732f9c2ae99dbcbf495e5293cf88408064f
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
-EBUILD vino-3.22.0-r2.ebuild 2062 BLAKE2B ccc686e8c3a255b8399b3d06e58b71922ae2d19302f811f93f1cd2748201e4d17920f801f36536104b634ef6f5ecf8f90f8426e0fc715499c6bdc663d874945b SHA512 e30814d36f8f82c765c734db4021d5816b7c3c11321b139564ef77c0536dcdfe6043982bdeda92bca15abe64ec0e258b1dff21317e7e425700cddddf31c961ba
 EBUILD vino-3.22.0-r3.ebuild 2012 BLAKE2B d6604f807b9e5b5aafe15b68e6b15ff8acf304620996cacb033e4b8b8bd992257c14d408aec763542d73c7f845668709869e95cf05f33ecd55f28ec7d9a652ad SHA512 a02a240c99114b1803fa1829d1a1853e53041ff0eba31ab1898b6136daf4c07b54b9158ceb4cf00829fb95e4beabcf73bd5e8fd9279bbae77838210cbe26792b
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/vino-3.22.0-r2.ebuild b/net-misc/vino/vino-3.22.0-r2.ebuild
deleted file mode 100644
index 0fa70f9a2063..000000000000
--- a/net-misc/vino/vino-3.22.0-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 systemd
-
-DESCRIPTION="An integrated VNC server for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
-# bug #394611; tight encoding requires zlib encoding
-REQUIRED_USE="jpeg? ( zlib )"
-
-# cairo used in vino-fb
-# libSM and libICE used in eggsmclient-xsmp
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libgcrypt-1.1.90:0=
-	>=x11-libs/gtk+-3:3
-
-	x11-libs/cairo:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/pango[X]
-
-	>=x11-libs/libnotify-0.7.0:=
-
-	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
-	gnome-keyring? ( app-crypt/libsecret )
-	jpeg? ( virtual/jpeg:0= )
-	ssl? ( >=net-libs/gnutls-2.2.0:= )
-	systemd? ( sys-apps/dbus[user-session] )
-	telepathy? (
-		dev-libs/dbus-glib
-		>=net-libs/telepathy-glib-0.18 )
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-	zlib? ( sys-libs/zlib:= )
-"
-DEPEND="${RDEPEND}
-	app-crypt/libsecret
-	dev-util/glib-utils
-	>=dev-util/intltool-0.50
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-# libsecret is always required at build time per bug 322763
-# eautoreconf needs gnome-common
-
-PATCHES=(
-	"${WORKDIR}"/patches/ # Patches from master branch at 2020-02-15 state; needs autoreconf
-	"${FILESDIR}"/CVE-2014-6053.patch
-	"${FILESDIR}"/CVE-2018-7225.patch
-	"${FILESDIR}"/CVE-2019-15681.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable ipv6) \
-		$(use_with crypt gcrypt) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_with gnome-keyring secret) \
-		$(use_with jpeg) \
-		$(use_with ssl gnutls) \
-		$(use_with telepathy) \
-		$(use_with zeroconf avahi) \
-		$(use_with zlib) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 8306d7ed6094..44c9ad96e437 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,5 @@
+AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 EBUILD wget-1.20.3-r1.ebuild 3215 BLAKE2B 046366c62070b9bfb055fc9b31f1e68817fd34d72f6e1ef60b5810b9d3a0154159a984100b85a7cda4f2dbf6c0d7f7d2e4c423a4742df9c88ca8d3bd396674bd SHA512 20f4632b350d918a04552e92ae61b742d8a99d4c2f5889a8eeb7cd6feb522707b997d5d433e8fcffb40f0851a7e259f704c5ae1aab4a7971c3b3adaa16bf7146
-EBUILD wget-1.20.3-r3.ebuild 3363 BLAKE2B 882c30312ff53b013c38cf4c9b3f2e9d4a5068dbc1c2454f7c0c90b2ff0d7e12ff6a9f88d576966129a62608828a4e608c7dab939497e9cdde366e6ec89d5a62 SHA512 84bb45efe21d6766c5a4c503103305318e3a16a6fb44f0e447cb8f9083cd6ae91f97828be547ff1d7dab095f678e65a12a313315483010ba8933d5b046ae2eb4
+EBUILD wget-1.20.3-r3.ebuild 3411 BLAKE2B 4aeaafbb078031c212673afd0ab734d0415873ed5fed8d773afcdf468d23b8533e6abcf16bc014eaf6641ae361dd5c0852eedab3759e30e961432983b6796325 SHA512 c777144fce1f8d35b56181830f266222deb372e06109df5ff91052012e9db9cbdcaeeff8637fca2f08cf763911bf8680c46402a3e0cf1c8b7249670d23803582
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch
new file mode 100644
index 000000000000..3b99f4071af0
--- /dev/null
+++ b/net-misc/wget/files/wget-1.20.3-gcc10-fno-common.patch
@@ -0,0 +1,32 @@
+From 04b7369490344d014b05dee5d48ca78cd04733ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sat, 22 Feb 2020 13:40:50 +0100
+Subject: [PATCH] * tests/unit-tests.c: Fix 'multiple definition of...' with
+ gcc 10
+
+---
+ tests/unit-tests.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/unit-tests.c b/tests/unit-tests.c
+index 5fae8a219..f66e5e664 100644
+--- a/tests/unit-tests.c
++++ b/tests/unit-tests.c
+@@ -37,7 +37,7 @@ as that of the covered work.  */
+ 
+ #include "unit-tests.h"
+ 
+-const char *program_argstring = "TEST";
++extern const char *program_argstring;
+ 
+ static int tests_run;
+ 
+@@ -69,7 +69,7 @@ all_tests(void)
+   return NULL;
+ }
+ 
+-const char *program_name; /* Needed by lib/error.c. */
++extern const char *program_name; /* Needed by lib/error.c. */
+ 
+ int
+ main (int argc _GL_UNUSED, const char *argv[])
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index dc1e481def73..b66e2ea1140a 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 ~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"
 IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
@@ -54,6 +54,8 @@ BDEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
+PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch )
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
deleted file mode 100644
index aad1a9921557..000000000000
--- a/net-misc/wicd/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX wicd-1.7.2.4-fix-desktop-categories.patch 879 BLAKE2B a953dde95d641fb98510834d52d01321b9d5b7e9118be656421daa11cad459b85f32ddbe57eb66267826e45cd308bdde566f819ebc7e355dac58c88bc8fbd14a SHA512 f67dd4bbe84dd145e25718185b6c50e5b2a99e77787ca536d1cc1844b0ed70d1d3acff3f660d94299479bc4d4ce685ebb43f7afd7565682b05d99e14d657ed9e
-AUX wicd-1.7.3-add-missing-gnome-shell-extension.patch 1695 BLAKE2B 225744c17cefea9d5f844991624f98df5467ea074ae5d498330c373baab1c94a650cd77972cf6276693e11fd78dcd1c05ccf5f20151debb28a5080dbc28aaabf SHA512 4a08360d192f040983e782a81f8a57b8407726531551f512f5ea8537c18c3abf8934a1c597e73945637e15c96ba0f26cfc63525d00981a7ab6897ef0ab4ed2e5
-AUX wicd-1.7.3-bitrate-property.patch 775 BLAKE2B d1897f86293f11ea3cab807500eb080294a4a2d6f3fc0bfabf75896355a2c9e69d2f235f4656e896b6420726f53d90ddcf214bb4171db4fb0e406718b2499444 SHA512 02a4e219b62b5ba36371aac75c89adf0e2c05d57d472ab39f7bca0f500140ff78cab94db292f793dc2398933d26c2e18e1c806940b339e120afbd617d83e67a8
-AUX wicd-1.7.3-undefined-LANG.patch 946 BLAKE2B 8f9cbebc5acb32d36c7335083f13e76ba46424bc0069d057770c94f7fbd64039c8d00d8323bd737ec39079554bb607723ca7ed3886da8bc1fdeaa59f63f545c1 SHA512 c2d197d41a84975bb3caf44de9b05b741b6702c38079ecc917632f9eedcf2be71373416154013690620511f2e9e99fb0d88cee0b22292fe007795cde664e63e5
-AUX wicd-1.7.3-urwid-1.3.0.patch 477 BLAKE2B b573ad0b47e1cf5ec0b78d0beff0c2791f5d918a59190afe48fc3f7cd1920c45e27818dcf88ece610d5187ee5ba5f2a014e290c625c0c586b5a78490879ed9fc SHA512 f5904e9fd082fb77d6b930285d6f1662d603d11c348068ec29820683aee319adf4ff0ddd28f7da80dc3c5b5834d9f9a0649d4077aed09d6c8ce8e24d8791d5c6
-AUX wicd-init-sve-start.patch 317 BLAKE2B 12fbe09fc6649b24b9f5c11dd867a8f1c5f88c39ea82381a4d5b063324493895963435ec1d874d7ce25783cdc4bf1f4eff3637a45ad407e073063ebe4e047782 SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc
-DIST Icone-Wicd-Lucid.tar.gz 9015 BLAKE2B 20c55968fe2be08a6dc5e2b3584f9c4294c69a988789bcaad80bed02daf0cc971344578eac7a69208fabb0c5faefb47891dec0977d04d7bcfcb24c9ba7394385 SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8
-DIST wicd-1.7.4.tar.gz 547393 BLAKE2B 045073781eb81a29754a238c0fded5d3225727497ea24c6cea58a1c72b83da76af6fc40a8e7345652c2dc9eb68ed24e0d97e421fd8c9e4d909a2c8f9460881ea SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959
-DIST wicd-mac4lin-icons.tar.xz 53136 BLAKE2B 5064546c2aebda92ce168847f2821ff11653939c21667f7f48263d3be0a9100dffa1322b9b2842cb92a2ca50dec39114b1246b057663ede8708db17271f16af3 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8
-EBUILD wicd-1.7.4-r3.ebuild 5063 BLAKE2B 64b0a6b00f68c554b240bfff6572e766d9ea88928896c68dccbcaac37d1bd56328ea032e6a6f4f554400bb301ed8362c735772540751edbbfedd2d2b4a51c2ca SHA512 defa56dc408a9175a0ca806c66056ed97d3972910284887a177e0dc312ec70b434b8b7ecbaf10cdac29b825796b2ca064892925b0f24f0dbd6a1e0e3485c9b7e
-MISC metadata.xml 913 BLAKE2B 8e18aa7554e1bafb89f90f6fa27bfbfedf76d3cc63929311d2ad4c87cd13869dcc2cc90c126c9ef61ebba5ff765e59656a5516cb410fb365beaa97dc47d54e11 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
deleted file mode 100644
index 0ccbd7833b23..000000000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-fix-desktop-categories.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd.desktop wicd-1.7.2.4/other/wicd.desktop
---- wicd-1.7.2.4.orig/other/wicd.desktop	2013-06-24 22:18:00.715578998 +0200
-+++ wicd-1.7.2.4/other/wicd.desktop	2013-06-24 22:18:57.672595363 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=Application;Network;
-+Categories=Network;Settings;Utility;X-GNOME-NetworkSettings;
- Exec=wicd-gtk --no-tray
- GenericName=Network Manager
- Icon=wicd-gtk
-diff -U 3 -dHrN wicd-1.7.2.4.orig/other/wicd-tray.desktop wicd-1.7.2.4/other/wicd-tray.desktop
---- wicd-1.7.2.4.orig/other/wicd-tray.desktop	2013-06-24 22:18:00.715578998 +0200
-+++ wicd-1.7.2.4/other/wicd-tray.desktop	2013-06-24 22:18:59.864595996 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=Application;Network;
-+Categories=Network;Settings;Utility;X-GNOME-NetworkSettings;
- Exec=wicd-gtk --tray
- GenericName=Network Manager
- Icon=wicd-gtk
diff --git a/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
deleted file mode 100644
index 9ea419eb4e71..000000000000
--- a/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/extension.js wicd-1.7.3/gnome-shell/extension.js
---- wicd-1.7.3.orig/gnome-shell/extension.js	1970-01-01 01:00:00.000000000 +0100
-+++ wicd-1.7.3/gnome-shell/extension.js	2015-01-19 14:12:12.962333228 +0100
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright © 2012, David Paleino <d.paleino@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License Version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+ *
-+ */
-+
-+const StatusIconDispatcher = imports.ui.statusIconDispatcher;
-+
-+function init(metadata) {
-+}
-+
-+function enable() {
-+    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = 'wicd-gtk';
-+}
-+
-+function disable() {
-+    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = '';
-+}
-diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/metadata.json wicd-1.7.3/gnome-shell/metadata.json
---- wicd-1.7.3.orig/gnome-shell/metadata.json	1970-01-01 01:00:00.000000000 +0100
-+++ wicd-1.7.3/gnome-shell/metadata.json	2015-01-19 14:12:12.962333228 +0100
-@@ -0,0 +1 @@
-+{"shell-version": ["3.4.2"], "uuid": "wicd@code.hanskalabs.net", "name": "WICD Network Manager", "description": "Show status of WICD"}
-\ No newline at end of file
diff --git a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
deleted file mode 100644
index 855a2939b5de..000000000000
--- a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/curses/netentry_curses.py
-+++ b/curses/netentry_curses.py
-@@ -538,11 +538,12 @@
-         self.bitrates = wireless.GetAvailableBitrates()
-         self.bitrates.append('auto')
-         self.bitrate_combo.set_list(self.bitrates)
--        self.bitrate_combo.set_focus(
--            self.bitrates.index(
--                wireless.GetWirelessProperty(networkID, 'bitrate')
-+        if wireless.GetWirelessProperty(networkID, 'bitrate'):
-+            self.bitrate_combo.set_focus(
-+                self.bitrates.index(
-+                    wireless.GetWirelessProperty(networkID, 'bitrate')
-+                )
-             )
--        )
-         self.allow_lower_bitrates_chkbox.set_state(
-             to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
-         )
diff --git a/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch b/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
deleted file mode 100644
index b854607d9583..000000000000
--- a/net-misc/wicd/files/wicd-1.7.3-undefined-LANG.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fixes compilation errors when os.environ['LANG'] is undefiend
---- ./setup.py
-+++ ./setup.py
-@@ -621,7 +621,7 @@ class compile_translations(Command):
-                 shutil.rmtree('translations/')
-             os.makedirs('translations')
- 
--            oldlang = os.environ['LANG']
-+            oldlang = os.environ.get('LANG', None)
-             os.environ['LANG'] = 'C'
- 
-             for pofile in sorted(glob('po/*.po')):
-@@ -656,7 +656,10 @@ class compile_translations(Command):
-                     os.makedirs('translations/' + lang + '/LC_MESSAGES/')
-                     os.system('pybabel compile -D wicd -i %s -l %s -d translations/' % (pofile, lang))
- 
--            os.environ['LANG'] = oldlang
-+            if oldlang is not None:
-+                os.environ['LANG'] = oldlang
-+            else:
-+                del os.environ['LANG']
- 
- class uninstall(Command):
-     description = "remove Wicd using uninstall.sh and install.log"
diff --git a/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
deleted file mode 100644
index d7f73dca8d59..000000000000
--- a/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/curses/wicd-curses.py
-+++ b/curses/wicd-curses.py
-@@ -1153,9 +1153,10 @@
-         if not ui._started:
-             return False
- 
--        input_data = ui.get_input_nonblocking()
-+        ui.set_input_timeouts(max_wait=0)
-+        input_data = ui.get_input()
-         # Resolve any "alarms" in the waiting
--        self.handle_keys(input_data[1])
-+        self.handle_keys(input_data)
- 
-         # Update the screen
-         canvas = self.frame.render((self.size), True)
diff --git a/net-misc/wicd/files/wicd-init-sve-start.patch b/net-misc/wicd/files/wicd-init-sve-start.patch
deleted file mode 100644
index c6314920d74a..000000000000
--- a/net-misc/wicd/files/wicd-init-sve-start.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=gentoo=wicd.in wicd-1.7.1b2/in/init=gentoo=wicd.in
---- wicd-1.7.1b2.old/in/init=gentoo=wicd.in	2011-05-07 20:52:13.000000000 +0200
-+++ wicd-1.7.1b2/in/init=gentoo=wicd.in	2011-05-07 20:52:43.000000000 +0200
-@@ -35,5 +35,5 @@
- 
- restart() {
- 	force_kill
--	start
-+	sve_start
- }
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
deleted file mode 100644
index 8fa97712dc59..000000000000
--- a/net-misc/wicd/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="ambiance">Install icons from Ubuntu's ambiance theme</flag>
-		<flag name="gtk">Installs a gtk UI. This is enabled by default because it is
-		intended behavior. Requires <pkg>dev-python/pygtk</pkg></flag>
-		<flag name="ioctl">Installs additional python libraries to use as a backend.
-	This will improve speed but is experimental.</flag>
-		<flag name="mac4lin">Change default icons to mac4lin icon set</flag>
-		<flag name="ncurses">Installs a ncurses UI</flag>
-		<flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
-	requires <pkg>sys-power/pm-utils</pkg></flag>
-		<flag name="gnome-shell">Install gnome-shell extension</flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">wicd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/wicd/wicd-1.7.4-r3.ebuild b/net-misc/wicd/wicd-1.7.4-r3.ebuild
deleted file mode 100644
index 02aec4da7736..000000000000
--- a/net-misc/wicd/wicd-1.7.4-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?,xml"
-
-inherit eutils distutils-r1 linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="https://launchpad.net/wicd"
-SRC_URI="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
-	mac4lin? ( https://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
-	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
-
-DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	X? (
-		gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
-		|| (
-			x11-misc/ktsuss
-			kde-plasma/kde-cli-tools[kdesu]
-		)
-	)
-	|| (
-		net-misc/dhcpcd
-		net-misc/dhcp
-		net-misc/pump
-	)
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	|| (
-		sys-apps/net-tools
-		sys-apps/ethtool
-	)
-	!gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
-	ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
-			 dev-python/python-wpactrl[${PYTHON_USEDEP}] )
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	ncurses? (
-		dev-python/urwid[${PYTHON_USEDEP}]
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-	)
-	pm-utils? ( sys-power/pm-utils )
-	gnome-shell? ( gnome-base/gnome-shell )
-	|| (
-		>=sys-apps/util-linux-2.31_rc1
-		net-wireless/rfkill
-	)
-	"
-PATCHES=(
-	"${FILESDIR}"/${PN}-init-sve-start.patch
-	# The Categories entry in the .desktop files is outdated
-	"${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
-	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
-	# Creates files -> give -p
-	"${FILESDIR}"/${PN}-1.7.3-add-missing-gnome-shell-extension.patch
-	# If LANG is undefined, build can fail (bug 537202)
-	"${FILESDIR}"/${PN}-1.7.3-undefined-LANG.patch
-	# Fix urwid compat again
-	"${FILESDIR}"/${PN}-1.7.3-urwid-1.3.0.patch
-	# Another compatibility patch from launchpad bug 1075399
-	"${FILESDIR}"/${PN}-1.7.3-bitrate-property.patch
-)
-
-src_prepare() {
-	CONFIG_CHECK="~CFG80211_WEXT"
-	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
-	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
-	check_extra_config
-
-	default
-
-	# get rid of opts variable to fix bug 381885
-	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
-	# Need to ensure that generated scripts use Python 2 at run time.
-	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
-	  -i setup.py || die "sed failed"
-	# Fix misc helper scripts:
-	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
-		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py || die
-	# fix shebang for openrc init script (bug #573846)
-	sed 's@/sbin/runscript@/sbin/openrc-run@' \
-		-i in/init=gentoo=wicd.in || die
-	if use nls; then
-	  # Asturian is faulty with PyBabel
-	  # (https://bugs.launchpad.net/wicd/+bug/928589)
-	  rm po/ast.po
-	  # zh_CN fails with newer PyBabel (Aug 2013)
-	  rm po/zh_CN.po
-	else
-	  # nuke translations
-	  rm po/*.po
-	fi
-
-	DOC_CONTENTS="To start wicd at boot with openRC, add
-		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
-		initscripts (except for net.lo) from all runlevels (2) Add these
-		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
-		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
-}
-
-src_configure() {
-	local myconf
-	use gtk || myconf="${myconf} --no-install-gtk"
-	use libnotify || myconf="${myconf} --no-use-notifications"
-	use ncurses || myconf="${myconf} --no-install-ncurses"
-	use pm-utils || myconf="${myconf} --no-install-pmutils"
-	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
-	python_setup
-	"${EPYTHON}" ./setup.py configure --no-install-docs \
-		--resume=/usr/share/wicd/scripts/ \
-		--suspend=/usr/share/wicd/scripts/ \
-		--verbose ${myconf}
-}
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/lib/wicd/configurations
-	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
-	keepdir /var/log/wicd
-	use nls || rm -rv "${D}"/usr/share/locale
-	systemd_dounit "${S}/other/wicd.service"
-
-	if use mac4lin; then
-		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
-		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/ || die
-	fi
-	if use ambiance; then
-		# Overwrite tray icons with ambiance icon
-		rm "${WORKDIR}/Icone Wicd Lucid"/signal* || die
-		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
-	# allows the connection. Else, you need to be in the group.
-	if ! has_version sys-auth/consolekit; then
-		ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
-		ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 70e173daf580..7ce663b51be6 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,7 +1,7 @@
 DIST you-get-0.4.1270.tar.gz 143127 BLAKE2B 2c18a97001caf0c44a5baf30042cde61ac0ad2e8a5d0c0dc178474ba9cb70671c4bc9ecbbb72515f4fec2306598ba1b42d66192f2a16aa8fd0d65ff47eeb0b61 SHA512 fc21563396d73b0fbd7ff02c423a256be548957ef5d72277c887d33ee05269c2aa404a66972e934d4f0076ebd30bfa1b0914b05c25b38b63b3701dad1361587b
 DIST you-get-0.4.1355.tar.gz 143921 BLAKE2B da303fbcedd0818d785f846da4022364c3782d74b50f01b8aa2c0da38f4d61108da22a991e3ae02660021df6ee3378fb9e03826210563aee37e7f85e72b52fa1 SHA512 20f092d49e554f994b57dec4f12a8a0f4aaf418f8e0ce68611e1424f5ee512cad104c5498fe7d133ae8fa1c65440fdbebb8d523d9792336ea5c62ac3a58aa9ba
 DIST you-get-0.4.536.tar.gz 104745 BLAKE2B 48a5432ae1d4448ce0dcbbfdf52225920eb8cd8e575030cc62da0637f10cc7bb02a983c27c5bdd4a9fac1b45ab129db4f7fcc2ebb4bd17189918e04dabae0cfd SHA512 13d280dd5f0e6b6b5033de6eb94a251007bfc21bd99a9c0af86a5ed7b1c9b267d742c278dd80ec0a13445e09f2e22aea23bc77a5da12557be33f97731258abc6
-EBUILD you-get-0.4.1270.ebuild 481 BLAKE2B 6767ed1e8591edc617c5841fe482525ed96aa629aec7bf5b89102cad33aa5cc550e2b86d73f19c6535ed107c0c5c942d85a67db5c6f0bdf127735f9788a0a2fe SHA512 9650b3ae2b2bbcfc928bb80e579b38d0bdd0cef7ff5b9d51af87b2598c0336a8f181bdfe185ce3ac21db0f84fa1c4da8797a6a4fb4389842b3784ee1fe18c544
-EBUILD you-get-0.4.1355.ebuild 485 BLAKE2B 7066187af2b085ffb7560dffe9468373b59e36b10cdbab1f62d140023bac42b2febb78d16777477c67007b9a373952c74cb64112b88b9e3c289da89243add485 SHA512 d18aa4ca6724c5a8ecccd70f5b48fae85a958d1139d1199df30c21f65384f14a118ce7d9cdd65b2b5cf25731c68974f245c5998d47dde27b536f3303882c7758
-EBUILD you-get-0.4.536.ebuild 479 BLAKE2B 8cff0bd50d7ecc90be4fd627a2bfe55733a5fe12a24b7b72ddd163fd0ea933d2eebeac25545e6b294eda229b9b7e77336fb4294beb0dff02114ceadb8d210604 SHA512 7b783e4dd9759f43b433423cec7950f7aee06cac32208339a50c06c260a3a14ba7e872841fbe0f589b381849508ebcd635c02bece270d597393c918556a33a8a
+EBUILD you-get-0.4.1270-r1.ebuild 485 BLAKE2B b0e8bdc4e0b9a2cd814b19876e87102e7fd17ae5ebaaa21c664799cb266cfaf31082dbb3e27b2cb5bd362a18f5e044d024af8497c628db086b6e4a38ff9e9038 SHA512 4930e84a414a836de7fdb7e03b3f7d5cd0ac2cafe7b80b015fbd678101456de4c03e2ee21855d2c5b1fd501125a0b0709c7487254697c48e57cf45a8eeebec4a
+EBUILD you-get-0.4.1355-r1.ebuild 489 BLAKE2B 553a8ad218524c336b2ba4d0b1c814b2325a8d9d6dcb8a05e3842cd08938056b54555a80167ff3b331c153772d91878757d6a31d49346455a3e69a73a135bf72 SHA512 5be3e46d8fe95a94ff6d5a0517ac2a0eb0703e03c8d1dc06a19b887e77c53a613fa99ebd1b1195dc4ec2e8077495107b2b474704eae4923bc078e74ee9e59aab
+EBUILD you-get-0.4.536-r1.ebuild 483 BLAKE2B 36ca93c77820ac029f79eb1401620c66b07e28a963d83aeb11be4b1e378b9bb9ba1af728b40537294d07298ec6614c9ae598630b80f35fc7d51182d0db66505d SHA512 2790cac8a0bc8fc5fbdae4d21dc7c493762ee2559992b5008d3a72aca1271d3f222eb186faba16ebc21c86ee1c8e93d54e15ba98d377bb10d1389624e2f2bbde
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1270.ebuild b/net-misc/you-get/you-get-0.4.1270-r1.ebuild
index de8bde115f56..c8fd8bc47327 100644
--- a/net-misc/you-get/you-get-0.4.1270.ebuild
+++ b/net-misc/you-get/you-get-0.4.1270-r1.ebuild
@@ -18,5 +18,5 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	virtual/ffmpeg
+	media-video/ffmpeg
 "
diff --git a/net-misc/you-get/you-get-0.4.1355.ebuild b/net-misc/you-get/you-get-0.4.1355-r1.ebuild
index 4dbfac016357..1e79ca147fa3 100644
--- a/net-misc/you-get/you-get-0.4.1355.ebuild
+++ b/net-misc/you-get/you-get-0.4.1355-r1.ebuild
@@ -18,5 +18,5 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	virtual/ffmpeg
+	media-video/ffmpeg
 "
diff --git a/net-misc/you-get/you-get-0.4.536.ebuild b/net-misc/you-get/you-get-0.4.536-r1.ebuild
index 0e14fc8fd496..6a6f50f9d60b 100644
--- a/net-misc/you-get/you-get-0.4.536.ebuild
+++ b/net-misc/you-get/you-get-0.4.536-r1.ebuild
@@ -18,5 +18,5 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	virtual/ffmpeg
+	media-video/ffmpeg
 "
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 8609c57c7e5c..2a1adb585438 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,4 @@
-DIST youtube-dl-2020.03.24.tar.gz 3165706 BLAKE2B 817cd8762f496255e58f909ab04f5fec3627918b4d9b58a9ab12c8bd56a12f672067c1dfe0808d76a96bc97fc7bc9a9e661c4f176577c0257f45d5cf6d0c7b92 SHA512 421c0ae412977cdf94d079aa7982360ffdfc4271bb7af27a598adbdb8454c2044e5c44ff3a9f339e9b0989c1264223ca83bba6a9151d01052f8f72c076d9e369
-EBUILD youtube-dl-2020.03.24.ebuild 2210 BLAKE2B 323d2ab1445d2a1333f4c23e561b302b95a6731657092e1a5085bda7c6b0605f07026079a7af5bd15a8b1fe91baf16e0d43856768473539812d2167be6e9e20b SHA512 f6378774bcadcca2dbd9ea55aa4eb003f7417188fa496fdd056ad66bf5d1a1da90ed98e696d4238340bc0f2a2d080a8e94c3ba33822c9566981faa8c92077c8b
-EBUILD youtube-dl-99999999.ebuild 2113 BLAKE2B b92cf80b267e39b08b11a488127b19cfb22387ee95c7a5ccd28de5aa15c81df32f6b55fcbbde65e64ec26018b2b0c105eb811620873963ca3494ba387df87596 SHA512 cfdcbb7a37cf355233fa191197ccd38a113b3bc7ab3391f42587614d129b8a310ec5896c4f069d2c3f6e9fc4e38b4141a721bc373b313961a93b72dd28458ae1
+DIST youtube-dl-2020.05.08.tar.gz 3172744 BLAKE2B d3ae7cc18f4156f4fe6fc17b4ef46f8406cd0b01ae18e3317d048bdbc737a9b12c67c9aded22a8e7631ea3b0f90f6b306f4148a5e33a0a597490b35fcf3b5113 SHA512 fbfd6bc42959547c6307b291478d7d86b79847a92d193b795d91f717471927d22c45356c0e2ba03ea1c5bc96d2fa5a949cb2283b0d7ec976bcf3a54d6c928ed1
+EBUILD youtube-dl-2020.05.08.ebuild 2165 BLAKE2B 287a55e622f3c36b8722de2b531a6c7779f17b996183eb535460bdc1ee10b175f0576e37cb4ada2522504a16e98d806546162e62d84499902de7af41136092a3 SHA512 2eb1b1917b312cd33615e159dc3a53df4bfd053bafac8dcc1f7562691e3491de10a84d166b4bd597576d7344e30cfd16fc1e3a86665ce3c410ba905403df511c
+EBUILD youtube-dl-99999999.ebuild 2068 BLAKE2B 93977d0be35ac43d7ba1cea51a20364effe0c87a11684e02a13b70fd682d8199fff2652bd86767b3ea4a148603ee93ecd7837e7fcc54139de5ae59cdc510c1e6 SHA512 429c926a0fce1cc0ab8cabdae8904ab0fcd99399c7b6e924d7034ad07f6d038489f44ebb9ac0d69cc270a023c37d0a2845fa22deb8bd94a4d6d9237dd1114043
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.05.08.ebuild
index 1f7d1a6c1729..9dc88dfb1591 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.03.24.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.05.08.ebuild
@@ -58,11 +58,10 @@ pkg_postinst() {
 	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
 	elog
 	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
+	elog "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."
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index e469e49163c2..a2a765dd04cb 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -58,11 +58,10 @@ pkg_postinst() {
 	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
 	elog
 	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
+	elog "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."
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 9c6cbef3cc57..fc4f54546efc 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,5 +1,4 @@
 AUX zerotier-1.4.6-add-armv7a-support.patch 419 BLAKE2B 8670511fb18c3833d17b601e692e141281d429f47281d12b420e5bf84c61a0312642be00785284739d68c33c353ff76b76b0651b03de4789cf7112c352c39648 SHA512 e2be80e39ee1a6f554b60c481f11e04c60a30bd8b198142aaeb7479365fee3d3e73ed9365f1ad7795c33781bf83693cc51a86ea5e294c63030fb111872dbad3a
-AUX zerotier-1.4.6-add-mk-ctlr-node-target.patch 1080 BLAKE2B 2c8395a8d32096fa83c7cc4d6600c12aeecd6f0881cf0279d4697ed2a764dbc7d84c87ab8c94fb6b0504c6f343a0d9c776c52f6d24e42cb4394a4d1bd9d42f97 SHA512 a72eb4e2f6c97484ff22b5caa2798d3cc45458b9035b33c325a9489f27196e0170a017a9dbb3b22eaa715d3c7b50365de270aaeaadfa46d910d39eb002770c36
 AUX zerotier-1.4.6-fixup-neon-support.patch 2667 BLAKE2B 39feb92294b2221fa61fbfe93c894bad4218528161854f74d5b5e9c301aef86b9f5a84de567d5050463d323a309179b4efb8e95eb09b22424c4ecfcc065a3da6 SHA512 f032b95f485ae264577f4c7f579a9f4e9ab4a82a5c806c6dc9bd37fb4262d60d98088a19b27a545893d1deedbefb7f1ffdeb52ac102d0b3cfbb82c46b3abca9a
 AUX zerotier-1.4.6-respect-ldflags.patch 455 BLAKE2B 2add558b3770e35d9318965eee27219366af4660935d2ee1261bc7735cbd77405ec8c8677f95ad31e02a0f81a9b9f1984b89ba2aeff3b919a84adfdebf7518bf SHA512 8b00309912e64a33086173f0c14649115bf82d5ceaf838642dc604e6ae1ec49d883c90ad5fcd93c9291fb7491cdd06b4d609ffc80c512425ee7c9988bb67149f
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
diff --git a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch b/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch
deleted file mode 100644
index 0d19099865b7..000000000000
--- a/net-misc/zerotier/files/zerotier-1.4.6-add-mk-ctlr-node-target.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/make-linux.mk b/make-linux.mk
-index 9fd4f7b9..a7eb7f6a 100644
---- a/make-linux.mk
-+++ b/make-linux.mk
-@@ -45,6 +45,12 @@ endif
- # Trying to use dynamically linked libhttp-parser causes tons of compatibility problems.
- ONE_OBJS+=ext/http-parser/http_parser.o
- 
-+ifeq ($(ZT_CONTROLLER),1)
-+	#LIBS+=-lpq -lrabbitmq
-+	#DEFS+=-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER
-+	override DEFS+=-DZT_CONTROLLER
-+endif
-+
- # Build with address sanitization library for advanced debugging (clang)
- ifeq ($(ZT_SANITIZE),1)
- 	DEFS+=-fsanitize=address -DASAN_OPTIONS=symbolize=1
-@@ -331,6 +337,9 @@ official:	FORCE
- docker:	FORCE
- 	docker build -f ext/installfiles/linux/zerotier-containerized/Dockerfile -t zerotier-containerized .
- 
-+controller-node:	FORCE
-+	make DEFS+="-DZT_CONTROLLER" one
-+
- central-controller:	FORCE
- 	make -j4 LDLIBS="-L/usr/pgsql-10/lib/ -lpq -Lext/librabbitmq/centos_x64/lib/ -lrabbitmq" CXXFLAGS="-I/usr/pgsql-10/include -I./ext/librabbitmq/centos_x64/include -fPIC" DEFS="-DZT_CONTROLLER_USE_LIBPQ -DZT_CONTROLLER" ZT_OFFICIAL=1 ZT_USE_X64_ASM_ED25519=1 one
-
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-17 14:32:10 +0100
commit	51c50bd4c895ebf56d81fecae8e45ec3b5fc3efa (patch)
tree	753b6b08624c34d1ed8414bbe22c45409f7741b9 /net-misc
parent	be9d77d3ac6af8f4ead98d89706f356b65578c93 (diff)
parent	deba8115d2c2af26df42966b91ef04ff4dd79cde (diff)