gentoo resync : 17.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-17 01:16:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-17 01:16:38 +0000
commit: 53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree: 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /net-misc
parent: 71deace00d1a2b091313fe137ab7092418c6f87c (diff)
220 files changed, 2261 insertions, 418 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3646868acba2..b688ab169c7a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/adjtimex/Manifest b/net-misc/adjtimex/Manifest
index f4a4be725407..f042183feded 100644
--- a/net-misc/adjtimex/Manifest
+++ b/net-misc/adjtimex/Manifest
@@ -2,5 +2,5 @@ AUX adjtimex-1.29-r2-gentoo-utc.patch 1011 BLAKE2B c4e7f951ef316917630cfa122058e
 AUX adjtimex.init 638 BLAKE2B 652bc1dd50a59bec204b669bb72ba3ca68ae65bc450d4ff662ba2af5f7d5f784f184a3cf7156439fdb72608ef46042d606fc4f1e9abb969ff3ce500f3db9cf6f SHA512 4d8caa72076ac8ba2c0f6cabb31a28254e609d2215cc8f830921e729013144fc10cb6a8796fff80ecc4bf1dc611652e81830e46e59c1726d3147cc1680017041
 DIST adjtimex_1.29-10.debian.tar.xz 33008 BLAKE2B b1da53008ef2373d9b450228bdb7f3378516880bf5b0d9b6d2c8aaa25880eea05954923e18497c42bf4e0f541dfa6c119c558b2712c5ed096a9c3e32dd3407c0 SHA512 4be30bdc63446259fe246e4d7fc0cb78fa40f40e9eb1a0b3a9d523d19ba0664be5e04f1803235a268eaae41cf4d88adfdbc6ecec86f8bd03703aca6c25ba9b8b
 DIST adjtimex_1.29.orig.tar.gz 85551 BLAKE2B 4e7784c3d3efa1f6ea226a7822de675a27c5be5d048664f8ff215eebe65b493e6dc0d004cc955c2e3b4e314e6283eafd628e92b611504b6ea92f4e5fe7d1a8c7 SHA512 5a48cdc538866c06562f62e369c08d60978c791ed91565262c0179c6fa25dd343963992d00e10f32475fdc00b458f81cf9c61adbfa9e1b7a8d4981ebeeff5649
-EBUILD adjtimex-1.29-r2.ebuild 1698 BLAKE2B 95ebc99d0073fd8887c35a11e72a07fe2097663014fd6299c63aa6511a257f3778193e6c037411560b8f0dec1bc817227b55f225703a8293ed1a9dc0b6a1b43c SHA512 629c4b4d7cf9c3922758955d571b5ac56a92e66d6b35414314a16f5464ded7aa4d72c2ec117c6c57999478055ae832da5696bd33d5f25d8817cf4ad812151da6
+EBUILD adjtimex-1.29-r2.ebuild 1698 BLAKE2B 7c797d15069fa7c505523c30dbdcec943f4cc54741aa29985a4a2a62b275cbf2d29d98a74abfb986ef5d1d0824522d6d169c541d52913a11ad9fefaa08c0ef10 SHA512 d2a18708d3d69449b2f78e8e51d2854ecb255db5605184327de2cd5c1064ba41ee49cdb5317d3dee0232f8835d570b4ea2aad4001a4a1c314831bf49a298f2fc
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild b/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
index 2dc2c4cc6338..b551ebc5c36c 100644
--- a/net-misc/adjtimex/adjtimex-1.29-r2.ebuild
+++ b/net-misc/adjtimex/adjtimex-1.29-r2.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"
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index ab45959796bb..c671108926ee 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1,4 +1,4 @@
 AUX aggregate-1.6-build-fixup.patch 193 BLAKE2B 99a4266726eb7ef36cb58c5f3ace8c36bc1f923f453acb003f3f59af179ab88e5ef641b387c03912f476a8bb29a46fada6ce5b4b6382d7328fd06752134ba186 SHA512 6c7508f88da5f287b5dbf7e12bf5891722300d11d0c167659c816a28dd38e2cf46de928b4cda48ee8ff6b6201b01cc6a41bc22345eb478ab255b5c1dc2713b11
 DIST aggregate-1.6.tar.gz 20566 BLAKE2B 8d7c9b16063da1481a1be57e1de8e73d5ee54ab8fe539b116263582b951bc84396b174388ce6ea1ee8126a1b1ac49e4e69dcfad8ded37f32edd429d620c4971f SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84
-EBUILD aggregate-1.6.ebuild 630 BLAKE2B 6aafa518e434abcdc80f794b25ef3fefebdb7047492b62fb4a4c17bc0cdc39750d5607afe886ad51e4eb97d8082cf3b422fe57b1e46b413d6e06580cb62b6314 SHA512 e686dadb6965b6d11ffb0cc1fd76dcec5f3767208c9f4d695289b83c981dd880a4270e81e53ee473a00e05df1c96d3f1e220a20cb8bfdbdc6661b111b3ed0e8e
+EBUILD aggregate-1.6.ebuild 630 BLAKE2B abb6acf97599dc38c3c8212c7aa7132d1209693a9733fb8c079f5e506ec90116f5093d0a08d700be3bc03ecbb8d4fb751ab37f33629fd87a80b1ab20c60666ba SHA512 c67517678076044267989a3153c012364e17593f23ac345844a72f1c727268cfe985f7e2804d53f543aa6b6170ad8f7a03c7dc8e51cecc0747135827687c9372
 MISC metadata.xml 975 BLAKE2B 5478f76eb90bbdb4daee5ccc930312d6b1e6fa162e20824b1c6ee7c9371183ca3436fe000ba9b7c66d4b991ace6109b5ff4d0bd0453a7c055105e2d3007fc124 SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index 0c189c9c5d57..62deaea14885 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 26b61058f326..4448fcff04fd 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -12,6 +12,6 @@ DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b
 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
 EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2879 BLAKE2B 4c9c3afcb14de20f728f9e30a6a1e589f93f030688c455eb8b3aebe4c2ba4d6216dcd4b201e20e4750947d03d7d96dca81482e6585a21f232b1a2aafa79151ce SHA512 707727031eacee8eed6ef40ff7a6bc096080ad63f4c6e9c50207154a39878211198be02eb1570b9f93318d8d47b21a96e0a4161409d23dca9987117e6e6166bc
 EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2986 BLAKE2B 67abb15845e25e8fd8369f457f095f1051015d230b550ec20446334053fe15caceac1e0da0ed7be97f2643f6f3b460d48803919d50e08c3e74a7f855c19932fd SHA512 86990db8ef1d294d222a3f7988d18384fd80f58fec1dbe6a05917baaed1e0e0bfe6609208d0edf4e6c3e6af589ebd7bbb9ae560a3ed2ae73506f377dd946b1c2
-EBUILD apt-cacher-ng-3.3_p2.ebuild 2835 BLAKE2B b465405ffc612eb7aa930e0597a7d9639351da40754ffefe6e4655708a1e49f17d31c5a53544541de7be1dad566b5d9994601fd3d3cf18145026ae03e022d125 SHA512 5771eab3a8a56fb692ebb54c495633f644b98f89069e83bc70f732b060da81b6c1621743afdf08c6373642ef336967cc97f481a1ce5ce48c6d5ffe271d244ec5
+EBUILD apt-cacher-ng-3.3_p2.ebuild 2835 BLAKE2B 493f5c0239468027e8b9ae9ab5a4c32a0c3112b0b405d8ade23414485c0ba63c91c47794e447ccd8ce9e06c7a2e16239c57e11cffe8996f7965db14e947002a9 SHA512 4964e404269bc52a1fc533430f8faf1d1d889384c08226bf853fdca5706a40f878d67137f0790556418661e6f7db7bc6de92f363e9c099be662fc25eb340b3a2
 EBUILD apt-cacher-ng-9999999.ebuild 2765 BLAKE2B 8df3e332732ccad11a6040820351e787bfa7f46eb6745d8bf6ec34fe7151a996248bea17bc91c2477fe50970b47f0427bd982ec59dcb88b36f49bfbd5bd114d7 SHA512 9843a2f6c6d91b1517b52a06085eb801589dcf46a019069400c7b2cde458d455b11e260a7fec621514d63b6c9a16f703c8427559f660a59384a60e54f3c5a63b
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
index ce8b2df72f46..cca26b8bae3a 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
@@ -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
diff --git a/net-misc/cbqinit/Manifest b/net-misc/cbqinit/Manifest
index 202c4afb24d5..51fa1eb37360 100644
--- a/net-misc/cbqinit/Manifest
+++ b/net-misc/cbqinit/Manifest
@@ -2,5 +2,5 @@ AUX cbq-1280.My_first_shaper.sample 79 BLAKE2B cd8a86512daa9aaea32e2e5fe7aea179b
 AUX cbqinit-0.7.3-gentoo.patch 1904 BLAKE2B a328f8c021d64d220d164491ae330932a20a1168e9948fab84f7f3ce22fb5ae0d8af8c9e599630fe873199471755f3dc2184956cc7310915b2c068bc07a763f4 SHA512 b33e3e7e23d6363dcb4b66357f666bdc5b299b851798db7a935d3edaf2612ae3494e6d0e0ea68375409a2834a0d50d322170c9c3f2b97ab00054a19f5bb27d44
 AUX rc_cbqinit-r1 505 BLAKE2B a9904191d8f884371211d9003b0664dd13b91f076ec29828db30fef531da8d13d8ce7ca0a229fafa11809719699b2880e26ff8424246c1a8ba1dd21f3125235f SHA512 29ace7a58bfc942c29b4992b317704ce05d11c6e9a205f0d74e604d65036b0932bacd4768fd0a6fe449ebd0d9735cf9232e956d2dbf45b5fda66215eff5d61d2
 DIST cbqinit-0.7.3 33438 BLAKE2B a2373fa73036e5c6360efc613bc6d950c26e269066fab227d5125084b2530ffc42b519e6d3a4423e9f8ef44fb4b29fe6fff96ef9bb650fe247bdaf1aae93eac1 SHA512 ab1f66ebce4653f53d85314f47dc4d5e2f28c081f7c0385138c33cbc78e588d7190eedcf8354b744cfae8b34d536d610a944d492c9b49361109978016fa167a1
-EBUILD cbqinit-0.7.3-r3.ebuild 804 BLAKE2B a0f7587d26155502df04d55865952fa90ca8fc35cb0ec46b0e3a7fbda080d39bf6426e72a8daad20db58f648c7fa05bafa6dfcd85e2439c712296810b6fd6768 SHA512 aae6adc91500ced07f2d84378ca3103161ef8db2de5b9e701e16a9fab3576fb8a27f45f537e37a9e6f50b595e5c475065c99678004d06067cb59ae8e1c2dd8e6
+EBUILD cbqinit-0.7.3-r3.ebuild 801 BLAKE2B 9f97ce75abdb999cf0ebe8fd23115f4a4078ad1b2ed4ec9e26cea7d32faee999fa769cf73e65d84f17e7d0fa2c5a660d82e5ab67168e481e8525ff10d28d3e12 SHA512 528c00fd0218b2fd76b63687656729718cea55f60e4a833878e761a59ad9566bf493b7ef92b37a6dc393b5c1ae74add59f6ab1d59d11a3a742e044c81d2ca4f8
 MISC metadata.xml 244 BLAKE2B fcc265125d0849eb0a093b0d57d57b20b95e0424df24e9f2be2697a0560a08f77d787c84cba6d10c2e6e32f824402f485b6339b42fc33b56f7ce2daf5c2e4a76 SHA512 d922092251c07becd0effd06de2ed063038394b7396c9a303e4e234ac514ec7a3c9f00e76503f4bb435ac5dce5401f3d05495def1ce94d63fa9d823dda1e3a54
diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild
index bca621277fb9..e22a9221af54 100644
--- a/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index c1c5595d542a..7df583fdb80d 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -20,7 +20,7 @@ DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
 EBUILD cfengine-2.2.10-r5.ebuild 3241 BLAKE2B 71e64eb4d323556416c67ddac89c3170d5178a38d4b072bca81172565d741e0d1c69f0b4de25df5713c8eaaae0f15b9724a579df87e0ca9718276eb117d10d22 SHA512 e4e02b753f443af0bd7966ee7ccddea2170ce080585e807eee514f4071d19da7fb1805b6fd6e42586b3c8ed2bc1777ff134b8853c6730a1b7c821b2f5ee792f6
-EBUILD cfengine-2.2.10-r6.ebuild 3289 BLAKE2B 64136477ff9d507d839024b28cc0e875928dbd15fb2deebbfd2afd75f62b58c95cf6276ad2a116db545fe84933caa5c9e3d8d2cf0ca506ec2e9aef6abeea60a6 SHA512 b7c635a2b631987fc2c773cdc650b46e64f478a7e8bd4e8249b8f6d356dc419e374e9f60702fe589cb2c775f0f8d65746805e16e3bd10da4245dca58198c8184
+EBUILD cfengine-2.2.10-r6.ebuild 3289 BLAKE2B a879eff37f932f5bf65639f47a6db9602b56239dd8fc0e0ed3d49468063696b5ed82b49643ceaf362dca2380fe142bb330d30ae1ef9b367e27931614a7ddc90a SHA512 39c6795f652346cd4dcb0455c4e637f12a0233c342e4dcc83d54e1e8a855462f8ea805f5883f7daacd527d35597733570acbe7445d732529407943f2aad064c1
 EBUILD cfengine-3.3.9.ebuild 3491 BLAKE2B b74a4325583d6ae105e0fe336be431e12d99a5d6a63d9c242e0ef3318b646c0091403507f9cf767bfe719b7ee5c65d1037cd4f9271c2396f290a04e553f1318a SHA512 803ec254482363e66056005af2f2befb886d84247f89f0054b2d9fc8d288aa642764a4a6c686f65dfc954923ade60f3b837df7e1066d1e73992d19ae7b737154
 EBUILD cfengine-3.4.5.ebuild 3717 BLAKE2B e7385a42ab34a3016afb4b0ab01eb6884640d4cfddb77b0f2b23328f4897a42d5cb3654f603b58398bd8a2971c83428a16d68afee37d5cfd93cd9e42f61c8e6f SHA512 ac9b0b051fbb64d80041e9eced6199ab533a0437813e0e37de21c3aa64a6a482bc1722dad68f7b2818f8ed2739165e2e23148631778d17a043f01a966a1e6973
 EBUILD cfengine-3.5.3.ebuild 3791 BLAKE2B 5ea2c138d74ecad59d7a84f3c6deaef9691945087da761fe869e2444d7f5b02083acc32e6af2f9d9c25533fa19fa610f1d7ce0d142dfaa5082d0a55da45baf29 SHA512 3e8d3e5bedd37d0dc9838ef887db2085ff871810a1d98010d280e0fe2570e6aa96739f90bfa12593ba3d25716ef7b3f700cf13f1bc6b10264b98777264e9923a
diff --git a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild b/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
index 87d5fa9341e0..d172669af7b2 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r6.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r6.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
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index fd99c65f9d61..58d9111b39ed 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -11,9 +11,9 @@ DIST chrony-3.1.tar.gz 424109 BLAKE2B eb6bc13905a05eab15b00919577cceb4c8c881b488
 DIST chrony-3.3.tar.gz 443571 BLAKE2B cc35f55b8d63eed85495f88b71c9285c68867a28b27c6c5e7d4475a77857ce4a09fbe561906757d66fee13b19d9ee750d41518050048776b2c0ef600407632e9 SHA512 36975d863599141e8e5b071d35cf67326b27f5b0da7ec942dbb4530377d10472b0729eea632e0702718b515cb2d5fd41a7eba158e6dade7f05adfb1bdffa5df0
 DIST chrony-3.4.tar.gz 453056 BLAKE2B 088eb18bfc9ae4a7a3d656dfabddc565bc4a0da995c172183bed12bc5df59e87ab7363ba64e3579cdb414da77bd7f1fe05b66e33474282df57daf1fd8a55e182 SHA512 4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918
 DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3518c953591f43224dc3da79f627027a6cd4bf9c4227e9f8659a69adbdb634252ff3920d2ef677e32012456 SHA512 c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c
-EBUILD chrony-3.1.ebuild 2826 BLAKE2B 2c62fb404c1a7b1a48fa020666c0664c9026d420d0080cfcb981218fa83a56fb0e606cdc871b153f6702684e328fe656c0a9427f8fb6b377cfc81b95af607efa SHA512 dc91684d43a5e298a4596d7b641a07a4db4fdab690aa7d1eb667933d788abaeee1c8d0c5e64df4775401eda664bc223555f6c4519d68893fcb58cfc7aecce2ec
+EBUILD chrony-3.1.ebuild 2823 BLAKE2B 6646382ab32032bcff541f7675457b39c2a2c4b38cf9c33aca7168f497fff39814caffdb531d774631fde56c6b91b004755517c8ff416cdd82da2ee2df9527b8 SHA512 311efdfc25c4d4efa7f85cfa20eb3eb1a9198460b4176127fe08f004faddf92f3c848343f92f02f09977b91a53e66fe106a953f355a3223cb46739b69d526367
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
 EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3
-EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 6277b565b82f3d9290322065d025ce6c706aa3d5a626f841b6e4b807cc1e23bfacd38f6d1e2f07f0fc0aa3993eca7d67e44029e1ef2db6ee4eee25e538e39cb2 SHA512 484a709b47094650d8328f1347a8c687fcd990f5a35e6b5da3da65edc03b1b57b21c3820dfda090ca709d5606c0ee3051c557364355ee73454ec7d7f1991be82
+EBUILD chrony-3.5-r2.ebuild 3035 BLAKE2B 3567ca621e71777dc34c90b77005e192f564bb8dba5f0705711eaa720262bebafde656da678b2d47130dee19caf8d2e52106ae27a0ee81e292b2defe1dadf5fa SHA512 2c8799bc3ac6e1759e048e37e6e4765d5a199fff043954e19a2640a060609c6281b397dc2834d10ecb34e5bb09b7b80c55b5bc96d0fa10a43b451799a1d53f3a
 EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c
 MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d
diff --git a/net-misc/chrony/chrony-3.1.ebuild b/net-misc/chrony/chrony-3.1.ebuild
index 3ab518c67684..edc3c363eb8b 100644
--- a/net-misc/chrony/chrony-3.1.ebuild
+++ b/net-misc/chrony/chrony-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/chrony/chrony-3.5-r2.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild
index af17665ec607..3bc2bacb2838 100644
--- a/net-misc/chrony/chrony-3.5-r2.ebuild
+++ b/net-misc/chrony/chrony-3.5-r2.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
diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
index 25b6fdbb2143..51a65d8e28b0 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -2,5 +2,5 @@ AUX clockspeed-0.62-gentoo.patch 6605 BLAKE2B e8394fe60510c0505cd343fb38ac080ccd
 AUX ntpclockset 1100 BLAKE2B a84e6d6ec78e8d0e9be34640db9f18cb6a15dfe35c583b3f1af654ec6ba39ede15bab5d92ed333c3c9758db532c29503f031157b5e18ee6eb3abcd3104b7410e SHA512 4301f84956df473aea2e13f304fc320897e680619a6933f5fe3b6fa229fc4e34dd6874bb6fa417c462f6eae2513ad7cccc843108331ee0a45fb19c7f0563dc6c
 DIST clockspeed-0.62.tar.gz 25797 BLAKE2B 3e409b09dd426dbe33a1aa27e08313bafb5f682ce4fb42740b88841bad2a88b6095e3b0d178c3d2b0f338a99a8ede03e00e79ce09559dc136addfd1d1e1ceca3 SHA512 4dae1cfcfc5eb1398fd5a7642ff91987487d9828d314d4bd9f93cdadc60fe99889280a7f8e9192674ed19d246bd4a450ad32b1258e450216111c488074db7978
 DIST leapsecs.dat.20081114 192 BLAKE2B 71113068e1fce9a11b9acba1527d90f6977302b6d8042fe83522fc2fea260a15b18226bc34cd84637b00d0e58a24c24d6f9ea537f1064b82655647ad4c58e0b6 SHA512 c85634ce30f40a03ae45983ee29483fe5859f291a0a69835dad1f50459327b212b8187a0c2c18c9a27fd74f2d69ed0d9a556349c8b2833b9a30107ed259aacc7
-EBUILD clockspeed-0.62-r6.ebuild 1179 BLAKE2B 2f00d220f2162d0a92565d776b3ef75aaf88762687e89f304ae54ac1e17bf0d734dd437dfa29b53125f097d1e3e933db38214c6406a8cad875f74aa12bf144d4 SHA512 15440cd55706f54c578227c99cb1a9fffb5dcd1960e0600f0db6f6545d8f3a767a887c3c581649ee0b3c341e3acf84f112e5c8496a20802623b6138bd55d588c
+EBUILD clockspeed-0.62-r6.ebuild 1193 BLAKE2B 39ef62870f8316af2e7d37f26732ec1e9ed9c6869f59659d1626479e4eeefe590fbfe2c40cbfd3b89089ef7676994dbc94ed4cfa57b1a77ddaa557b361da95f6 SHA512 04c9d9bef35d41402b30b30d5e4a879c1923fa4a0942b24541017e85399ac033f2b96c30956be5da980a70c788ee282036dc4bf207082d7effa001443d85b200
 MISC metadata.xml 416 BLAKE2B b11bd8ea02066ba97613146ac7984f394b5fa4e1b34b2781f0e3fb747affebc6f5db19bde801ca0e0465699520561c24293e6855f40df0c93d9e21fd7463f094 SHA512 966f4ad088720ae3da99158933a8344b9f17b7f251ae37562b99ee8cdc9e1fdbb0d530e42703208ed1373932037918e4657bd0663a42f3a3348505ccdcd39d69
diff --git a/net-misc/clockspeed/clockspeed-0.62-r6.ebuild b/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
index 172b3051b388..52a57b35b423 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-inherit eutils flag-o-matic
+
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A simple Network Time Protocol (NTP) client"
 HOMEPAGE="http://cr.yp.to/clockspeed.html"
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index a7275a5fccc1..057b0240c592 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -3,5 +3,5 @@ DIST cni-plugins-0.8.3.tar.gz 2001599 BLAKE2B e087814146c53d372af5b1cc47098f0060
 DIST cni-plugins-0.8.4.tar.gz 2002863 BLAKE2B afc0229256f04b5079ff4f30fca422e7e72dc46b01a988b38647bbed767ad4c8362c99eca84ade86a52ffbd3aadda60ae1b14974436eab862d4c9ed356320b2b SHA512 1a66a9d2cc3bad17201426905ed8349fa0c260ffef423338bc93c4ff191c4d38e6b9228ca3b5c44b148c854379f741f2dbd88ac9937dc1599f95f4df8b6f4346
 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 53d9301d6bfdb85480256d107c9ba5396e2c188481b2c2dc7046a9a6d4329c6732e1b945aef4accfe6b09d13585ad03a917665b44f8b959d682433c3d317e23c SHA512 2a026d1c56a012198a515a50710498d33902c787969ec411f73b9db0feb3d1683600511875897f5d565f8cdd4766ef4d10c69cfe1cc68f8efaeca4e537213a34
+EBUILD cni-plugins-0.8.4.ebuild 1182 BLAKE2B 45476f645c86ca1518bf46315df141f515468c710f7fc78f792ec8ea10d0ddce300c8a645c07ba033833260e8e9f9ca77bdcd23c0a8c39b42161689c033d248a SHA512 a8099a79a4f6f2540a3e735eedf7688233d9f04cb77f682574d2492025998be573e864d02104d987e9e6c5ba72db9ff91c3fecf6af730bf191ab878b036d018c
 MISC metadata.xml 350 BLAKE2B 9cd61d5f345c1e1967db0576296baf94bf06a59709485d150052af880eaef6a453ec0dd1cbf5003657ceb00bfba60c05e8225b9fa27828a7b6c377149ca23d0e SHA512 99cd00c8a61afa34a7a974eb9663314fa8abe0c61a384b222cb27f57aefd8116c450143f0e7c65f52d4cff1ee9852ed72f8efd13d548d2e0bc41475bf4dc2e2b
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild
index 82ab7c1b97fb..855cb97aab8b 100644
--- a/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 5f86977c8cdf..b78ff4c4b9ac 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -2,6 +2,8 @@ AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad8
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
+DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
 EBUILD connman-1.37.ebuild 2596 BLAKE2B 6c8ccfffaaad05f5a09b93b11dd9fc5000c3899db79f84d6bad9a959ebea5c01f21f0bef203fa1524aec6a16e384c0167167b8c3915bd230fb721b15e863ba8d SHA512 ff3f15f3258908c623d8ba0b6295a825984db6a905189595ae7fe506d316b3076d03b396324187852161245e555f257f4c0e8f560284bcdd38d3c593164bfb5c
+EBUILD connman-1.38.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
 EBUILD connman-9999.ebuild 2728 BLAKE2B 40425b699009ba247ea64db4db90c86914c5d69c70614e9c1fd4071ad30d6ad73f1e7558befe877788b00d3e551973d93cd38f28519dc7f11c4e0b3f7d14751e SHA512 7b15cf1018816892e0d11011e9f6bdf823f140e10158b9a55a230b88e2f1a2980fcabee4d681c23f4939eb387fb8d93cc9400bd64a58dc61e9bddee1718161da
 MISC metadata.xml 1220 BLAKE2B 0d56b48507231a37eed6f84e5875ea55571a8cfc0379b7b16c3d74650fa011876b7466a96bfbcf7a9db9cc931c2662d678d33872082dec7b444dc404430e71bd SHA512 591edad65cd7efc59a63b207c5ea7b60b624ee91b3ab1d4aa165d4b2824640fffeca662d7f6ba34822e38777ceae9aa3caafd39d328294f245e988c77fbede5d
diff --git a/net-misc/connman/connman-1.38.ebuild b/net-misc/connman/connman-1.38.ebuild
new file mode 100644
index 000000000000..937b54ecf834
--- /dev/null
+++ b/net-misc/connman/connman-1.38.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	bluetooth? ( net-wireless/bluez )
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable debug) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable examples test) \
+		$(use_enable iwd) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable networkmanager nmcompat) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable tools) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable wireguard) \
+		$(use_enable wispr wispr builtin) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 9905788b4827..f8b4e6729630 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,9 +6,9 @@ DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be
 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
-EBUILD curl-7.65.0.ebuild 6954 BLAKE2B 6bd9b3a4864ee87d077d4fab50dd066e52bb0f6ff5ae6c094dcca4169bc56f57ec2392bb9e9d338e6992fce1cf2d7596495b100fc16191d1db1e2f9f4667e192 SHA512 83bda5c36f8bc2b80611e56d971fce36c08a842701d5ca0f8946f484396a9e41729f2510672d3333261fb77ed430ed607c3a2a72122b0be3005a3fc8e3a4c521
+EBUILD curl-7.65.0.ebuild 6954 BLAKE2B 8c09fd1fa5f32fe5acdf4be4fcf3049e1cca7961c189b8fdcbef68fb2d9d4da394f490849d11b0c1879cc19dce23c84f3c1c6349658fc808bbf6a370e0cfa060 SHA512 1a9cf55e36fe409683039cedf90056d1c261b01e854a31e54b6ecb1d4a8f584b8c216a2c20487d9447c4c35ff8d8dc99aef49893bd938933953b7a197d91ec99
 EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494
-EBUILD curl-7.66.0.ebuild 7565 BLAKE2B 09f842e807c789d515d095ee1b433e1ce77493f59733b91c7ba52775b35af49668c7e00af79f7cf0d0ee8f784c5f473506f8effdfeb3847c3ffd51fc80b2d8cf SHA512 deffa02bced4c7edab01d6b0fd9c76c9f316ba97a943263bfaf6e8362e4d44d3117743f8007e18783460abab2de792a5dd05bada1fc117121b32aef4250bfd0c
+EBUILD curl-7.66.0.ebuild 7565 BLAKE2B 4898aaa5d6c5503b6cb2cd213ae3757f7bb7a39cc59cb9bd28503a9fcf05e1856e1552a132901234b67d880c18bdc7f42ee9e48524acbc1592d59af04b2ed4d2 SHA512 1563036caf7e1702ac95b6f1f8d40276dff58618d1b21ab078a6febc57289c5156ea411c59ce44bf74ad7ddd63a244f79d180ffd43b4bf1b31a1b7403846471c
 EBUILD curl-7.67.0-r1.ebuild 7591 BLAKE2B 49b533d4b4176b495b983e0e149934e3ae2ec694c2eeb8be7dd81c412ee7e4409243efca5ef01d395d8d46b78c9f6ad346b6d6bd35acb7e90393a2169b3b4106 SHA512 c633b9884c895558407cdaedd89bd1d71cd43bd9db97c7fc7952e2d6acad016115364a6da798b6ceb88d5e9880373041c25a53c943e35c01757d2cf9dc4bfb09
 EBUILD curl-7.68.0.ebuild 7613 BLAKE2B e3270e7970b9f046ab3cc598722aad13dc38cf6790f7872a9abdec78d888aaac62720bae5fc3ea62c98d481a1fcf1998956c28b2a5eed28713fe56ff43b1a060 SHA512 3d96b8aef75184f125df727cf3035af996b57fa089825636669200a0a50b0560750e6e248a42806b50a2e5b8d8bfa81edf9da989a15c978c86b502598b187aa9
 MISC metadata.xml 1219 BLAKE2B 981090b46e9e66661074be920692e688ebd351ad1770b3a1b76ac6f3b6cc66c70c370031affdf5f72b2141e04ab7e4e073b4bc1fcd0295624e14a929cc3714d1 SHA512 9f86ffa85c0ac69c7289a97a92d5e592a17e5cc23b62be980540cdc8702cf6151361be4f171446fca317d2dcb1c5879ba8ae1ad0b0d99ffb54366ca35df4052d
diff --git a/net-misc/curl/curl-7.65.0.ebuild b/net-misc/curl/curl-7.65.0.ebuild
index 3a6eb0c8d459..a34b455658e7 100644
--- a/net-misc/curl/curl-7.65.0.ebuild
+++ b/net-misc/curl/curl-7.65.0.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"
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 0fa1fcb7b7cb..2149bb3acbe1 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.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"
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index e499444c4760..fd1b7eba04ea 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -23,7 +23,7 @@ AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 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 7905 BLAKE2B 9731300b80a0c0b2b84bf3e3a30ac5e95b980c8f4e891567452af67488b81ab783b91a920a897c21dc12428a0d861fe38739a6587c176853eb971eca422cdf2d SHA512 21c22b1407e245f7dd9b29765a69b8d07d029d0c889d31f7b0bc76fc7b21b3ff8c9b42dd4b656375214735154667f869aaf933a43b9eb777cff9ebb2b0f2f27e
+EBUILD dhcp-4.4.1.ebuild 7905 BLAKE2B a6d29d223d131f97c96534d9d13511789582e43aee9cff7fed74d7c74c1bea95838ee21bb88029816daf6f82501289051a8ea193279ec0f97aef22a282405621 SHA512 e4a2e123ecbabe9b26a614a2f8037854f94cf69e328f2da85f9fa8b7897452bf19468e14dc56e8bbb86770d913ec2b55d459fedbf05c79a49b3c6a8f13fb2fbf
 EBUILD dhcp-4.4.2-r1.ebuild 7962 BLAKE2B 721bf195a630d35779744f9081e0e104b60d563284c4b092ba308100182fb1f7dc8e165a141fdb23504688015cd9f040cc1cecdd075bb521b3466b251582612e SHA512 55bf16cd4359588ad73c845b757cc04c9dac01d7e7960a23acf344d50341b4c860e815ec56ef41f0434e6c569e3c11f67cbd3683814459ea6dce38c4e0a4fd15
 EBUILD dhcp-4.4.2.ebuild 7934 BLAKE2B 43944b83a3cf71d6461076d586e40c81853ca62af026f6890911d42803cc981278bfdd68bdb1b667351765c02c6b7005c01d6f9935436a1fda17f5358da975e4 SHA512 e9bfb118e7d6fc4258eed4a9ee2d0f18be76d4aa5241ab874a3cc6eec631bb675f7e83e2bde08d1898dbc0b3cef306bcdd2c8276bfd982d837dc825651b292ee
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 3576f3bb3f7d..3e2837952209 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 550230652215..3a10fca206f3 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,7 +5,7 @@ DIST dhcpcd-7.2.5.tar.xz 214124 BLAKE2B 7a5f32b66187afcaa2bb4a1cbcc0d704a28a27ff
 DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
 DIST dhcpcd-8.1.5.tar.xz 229212 BLAKE2B 9b60485a673001479d21727548266440eb44e070af873d014a43b3b0f189e2c6d3d1e3c04b7d67fd45f54edf75e0e24703f0bacb3c3ae114273b8428ca30d1d4 SHA512 59c8ae255b18b6678b22d4bd5f6797ac20e762d1d22e5ba4c0aefce5ec0d4f863876c06c03dd4c5e71f4d65884474cef9c29f95658eac55097603becd96e3846
 DIST dhcpcd-8.1.6.tar.xz 229224 BLAKE2B ad3d024b5a62feb3c9cb39ada0323d336af831cb9892dc50b93c672e6ae2a5607526122a9a5f63a00915a182ea7e7a0ae6b19bbb965bd1fa9ca58cbcac81cd66 SHA512 f4d7ea5f4c139a2735e795e13be68f6edac89d86d97589c2cdd67f89b890a093675dcc207c681332e2163b1094da8ce75bda2ee614c19bafd01410d9fadf19df
-EBUILD dhcpcd-7.2.3.ebuild 4386 BLAKE2B 700b5c23c42b064693e0088d1253842e8e168e61f7b864e4d649da7407719a33661d7f9bd5e60a0cc56cd1fd6b19cf66b48aa8c3094cb0a3de59861957b036af SHA512 2277c5a8072d9e47734710e217fd9110620e196d593381f148d47a2c54e82b7d6ed37de24f0105f09c37a4be76e22b581eb475e4f19478b89b354ed3303f76b3
+EBUILD dhcpcd-7.2.3.ebuild 4386 BLAKE2B c9f1e817bbf184b16c43c5b974d824ee2b05c4a521f7ac77678fe79875f146db13d46495af840d13547e6ac5f31ccd637970e1a9a08cecad7d22f9c103cd256e SHA512 e799b52717072a3e5c1221b8cbb92aefada154db84c2faab07eda5597ab9dc8d8bdbe42cf9a2c2a472a57c6304208af91c6bcf97a33f61f9cf729b4540a8d0fb
 EBUILD dhcpcd-7.2.5.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 EBUILD dhcpcd-8.0.6.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 EBUILD dhcpcd-8.1.5.ebuild 4398 BLAKE2B e6f1fcf4d35747e771896ee3c37bde2ce7e90eef8892a0d014a124fcb3dc111079ef4570eff535c86dff69c206356df8844c6b919ac9f2d7ec6aab8769d48285 SHA512 7047213143759d2740405fba60d6a617e18506fe6b050b8a34768cd850e830636045dc3ebb81704bf1ad8ec84b56004a525df0aa79cc33a7df799e3bfd68a270
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
index f34b1ad75caf..f7b4a7148b85 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.3.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
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index 20b24605b2ca..3b1be210bd75 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD dleyna-server-0.5.0.ebuild 872 BLAKE2B cf3ea2916e153af0b4438d01d7b2495112d2fe356fbc3b3f74fb7f811327cd91f0fef142cd4fb8b4bfbc2eb338f04ad63deb84ee10582611ac53b2fe9f046c6e SHA512 fac6e7c16a244a41f46b48b79f15d3835affea3be55209b4f522c8c7a5b0a0eea8ea1070d5f4e9a3b464a5660c60d3e0d678a3ea3b0bf2c8db88d5a4ae3034c7
+EBUILD dleyna-server-0.5.0.ebuild 877 BLAKE2B 78cc1ef9d19ed88df304ad41faf6fd4de87d14358b516d66ee32a77d6bfc9438970e934c1c2f5a6ba13b2156db9316416077bdc0fe823a3bb90a1e6b70f991c1 SHA512 219e65f5e4de35e016920cfbd12078310fd569cb7bed952ea1623508190a86a1baca3a5917a9f70c255a212d23228118ff7e057f606b2780343e0522184eea2f
 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
index 9d565e6f13d5..72f80642cf90 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit eutils ltprune
 
 DESCRIPTION="library for implementing services that allow clients to discover, browse and manipulate DLNA Servers"
 HOMEPAGE="https://01.org/dleyna/"
diff --git a/net-misc/dmr_utils/Manifest b/net-misc/dmr_utils/Manifest
index 357086058870..199ebaadb406 100644
--- a/net-misc/dmr_utils/Manifest
+++ b/net-misc/dmr_utils/Manifest
@@ -1,2 +1,2 @@
-EBUILD dmr_utils-9999.ebuild 448 BLAKE2B e59dae74b82f90ffa88358b406d1196d70b12270a3db49d39447489d0b85f3370e9fa74e638b8a7f103a7f714da9d91de01bec906159f6470729cd9303509421 SHA512 8e7bbc93dd0658bbf95c87611b38a327c42363047150a64acd7e7e2f659f1829a2cf4f36107acabccf979756302a1d01f76edb1b5bcb5e427f10a69988bd0a96
+EBUILD dmr_utils-9999.ebuild 438 BLAKE2B 31fa2571ec54b379bbcb7c34497762efcc41c29cf4a54ff5206f17c39e12b5d06dd85c5b902f98ab58bfcfdd86aca7a4fd96f521fc546444c392f34811564e9f SHA512 bde028534c8f7cb22e9cf00740fec6ce171e46e7b58e49e41aab4306d47c72169bb2da62a8a5747754781250cd0efd3dd1c79bd9c20214ef4b4b679678e914b4
 MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/net-misc/dmr_utils/dmr_utils-9999.ebuild b/net-misc/dmr_utils/dmr_utils-9999.ebuild
index dff3e7fd70b0..134326c73ccf 100644
--- a/net-misc/dmr_utils/dmr_utils-9999.ebuild
+++ b/net-misc/dmr_utils/dmr_utils-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit git-r3 distutils-r1
 
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 670159cc03ec..6b4b75cf8aca 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -4,7 +4,7 @@ AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a1
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
 DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
-EBUILD dropbear-2017.75.ebuild 2478 BLAKE2B 04964effe9e8f0c1655cc626dadf4995a2e4ec2f8271c0bc28a1cce9eb93bd889d2c64035b1c5aa109a807469cc8216b4d0bdf31e7b6dc064d9e5e4ad7815dc9 SHA512 40a6b903495ff7b6a573de2322394945f79eaaaad6a5d767b1ff776dc8d4d8e8da3202d122b31f9e0f06412bc8b1dba683b7f606771c504e8172cafab41e1427
+EBUILD dropbear-2017.75.ebuild 2478 BLAKE2B 8d5313e48243fd3196376321bc1e5df6e6d0f5e74de2da0cc807ef5575537325346bd442c2e2eb36f4d67341f766efeba42ccc12e22a15e1695a440b8e21463d SHA512 c43c2c4788a153bad5c0a5c02d5ca290305e6efe27dadbd30fb11906dcdce78be4ff8928cee4b3c261c4b2ae8bb78c1923adf0526451180dd5c1bd3177202d8f
 EBUILD dropbear-2018.76.ebuild 2657 BLAKE2B b58bc6b4acdabdc63ddee489c8d5bf3c6a56f5fc5fa26ec4c66e37df2724a7abc4d5ce5bba3eaf0532b82cf146cbe33271f945dff645a9a35a534f50cf13960a SHA512 7449a450bfdc03364dbff6a32d63b720ef0ac7ab47fcf5aee15da7e4db1cbb6abf7a69b73eecee4cc81d4c81779b01b471bbd975831cf47eb0740dcd4a4b332e
 EBUILD dropbear-2019.78.ebuild 2704 BLAKE2B 3ff6a6aebafe7b3d31f83a890b56323b727d3f5830d5b4f92ef3a57050caf364ececec071bc1285e23a4c03b1b52ae8840c205eaef6636abf4f99c7543b96633 SHA512 bc1e300042447bfa9f781363246f996159e18718af69229d2a9dec0dc38b3d4df75438603dbb577fe76e7d0e6aec85f90eaa0c8ef470752d6fb6d02ae151f168
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
index 90e2010fd9b7..f0abfda41d03 100644
--- a/net-misc/dropbear/dropbear-2017.75.ebuild
+++ b/net-misc/dropbear/dropbear-2017.75.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="5"
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index a8349ef1a604..a4ce6ce19caa 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,10 +1,4 @@
 AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c181a73e10a1d065b046e4a35db5a10270f55a6805d52f985be75766bdb56516ea787fd71f72609285455de9e85f2 SHA512 b54e326267ab5de72820be006ec02a0bb33286e6e577165cf0ad3ae3015bcd6f568f99a9866299b7ab64519907baa61a611514be067adaab3e11484d83d576df
-AUX dropbox-cli-completion 129 BLAKE2B 6e8c72ceb1ad993c90178c3aa99b7da861ed3ea4d3482e4712c8dabfc3d79b16c02c5175977c7e5a6a474731a54af0f01b97c398b319f5065ec83951663c9e35 SHA512 d85963af334d1f8bb293caf6b344e5085562224942525b459c6e9554a24e9a497b2d2ce43356d76f93aac70ebad58dae3e2ab2aaa29cefed0d2e75ecc9c064bb
-DIST dropbox-cli-1.6.0.py.xz 17632 BLAKE2B 244e36ea2b1f3a7ad36884de227933f91ca94dd907fadc300cc599336b4a09efec54e9f4cd26aa922609755812cfcd0f506866d0a66e74700c1b90a8c4347683 SHA512 06fcbba67031c18fe1840f592d04039a7c78848d6e77ae8cca04881f5f72ada7fb368921e2ae3b92d161e49bf91eae0f41b559a210eacd0dc203c51134597857
-DIST dropbox-cli-1.py.xz 17580 BLAKE2B 9bb165f419df716acfb485f40e3b40238d06db1448cf12731499f8b891d1a2b3de57ae405807c9b61316bea65eca133c95a88a475db210173efb915707e2154d SHA512 d5510a66a5605e474059bb761cc2f33cd4d23481e85f040b049c36759a030f1e7072a9ad2cc7f72e59507767aa375ff3ea1c06d7bf702eb7ba7d698db2bfefe5
 DIST dropbox-cli-19.py.xz 13960 BLAKE2B 16d33155cbe5449434ff9fc5a9fddca9a7cd20bd3ff8fc46f4badcc30d71f6b0b6adde6f6d0ad73702e4dd2957cc00f88f49b2580c289525784f97d4502e008d SHA512 b5ea1632c135232f4705a0e95419d176638e6a830a2a7d32f955c615328097b987887513cf06103b452a7efe2690ffe351a275267451db9d2998d19ac6f8f85f
-EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
-EBUILD dropbox-cli-1.6.0-r1.ebuild 721 BLAKE2B 63464febf1675553135fa92bc0df4821015d924a26ffeb8d788057109c494340eba160bb24c96da991443772c8d9d73fce89b7852a64880be414f53c4c123ef1 SHA512 317e442fbdb8f78ff63a77ebcda2a33700ea1aa187c4d2c5fdb1d7e206153af32258d15411256eb74f4f96714e0e7011281cf039953086ea32cf4983c2177047
-EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
 EBUILD dropbox-cli-19.ebuild 710 BLAKE2B 9ff353fffc498a9a9697fafb9ea962c1f8cb83787ff62cbba815e83037dea32b4d8bc19f93c586c07f6abe3707176f8e9c2328b3b37d47d3b3c71c5de28a690f SHA512 c996a797a31da15c1354a17ba1eac71335e862f4033a34936861363988638727b701ebe47615974689696d834cb93ebcde90777822172340dd129820c4416e54
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
deleted file mode 100644
index aae2afff5d09..000000000000
--- a/net-misc/dropbox-cli/dropbox-cli-1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Cli interface for dropbox daemon (python)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="net-misc/dropbox
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin ${P}.py ${PN}
-	python_replicate_script "${D}"/usr/bin/${PN}
-}
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
deleted file mode 100644
index fe8d22897aae..000000000000
--- a/net-misc/dropbox-cli/dropbox-cli-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 bash-completion-r1
-
-DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="net-misc/dropbox
-	${PYTHON_DEPS}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin ${P}.py ${PN}
-	python_replicate_script "${D}"/usr/bin/${PN}
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-}
diff --git a/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild b/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
deleted file mode 100644
index c7230031c47e..000000000000
--- a/net-misc/dropbox-cli/dropbox-cli-1.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.py.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="net-misc/dropbox
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin ${P}.py ${PN}
-	python_replicate_script "${D}"/usr/bin/${PN}
-}
diff --git a/net-misc/dropbox-cli/files/dropbox-cli-completion b/net-misc/dropbox-cli/files/dropbox-cli-completion
deleted file mode 100644
index e1e9251ca9ba..000000000000
--- a/net-misc/dropbox-cli/files/dropbox-cli-completion
+++ /dev/null
@@ -1,2 +0,0 @@
-# dropbox-cli completion
-complete -W 'autostart exclude filestatus help lansync ls puburl running start status stop' dropbox-cli
diff --git a/net-misc/efax/Manifest b/net-misc/efax/Manifest
index 48b7b9ba727c..e150c4bf4323 100644
--- a/net-misc/efax/Manifest
+++ b/net-misc/efax/Manifest
@@ -5,6 +5,6 @@ DIST efax-0.9a-001114.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b
 DIST efax_0.9a-19.1.diff.gz 18698 BLAKE2B 4b0a97e39f65009ff0f295cd4f573a919580ef442a3f0d3d838f79a7a7e31d70beb7b849a2a8bae839a244b1a43ecddedf90fe1bc59f8794906cb3d354557456 SHA512 dd656dd9f737aea598fc0ba241048e695018bce7eb439e009bc751fba1690dc28a99bee53db0c87d0638c9e4ac02b37e6de543355f06e1d8c87ed3d20e354cfc
 DIST efax_0.9a-19.diff.gz 18178 BLAKE2B d3dca49db55a52839c88c52c8934976fd56e32fb9501c27fe211b4bd4ed4b85014915f2e0785f7668cfc9743262ee6232af92c477386cc32f2b57e336aa4354e SHA512 8b1a2d007ebba73b772400eb1e0ccc61d832775590ac4fd6e171008c9741409118db099b444dc8da04dd87f1cb7025a9af62f60b2c3ccba21cc89863a2909735
 DIST efax_0.9a.orig.tar.gz 97402 BLAKE2B 4c8365814dda4cc8c53da9cf6f71ae95c9a5b64a4677f0f717d03ea53710df1944db07514d01c18f9bf0d2c64642a2b7ca0416a7571a6f4b880ad8098a919c5e SHA512 b6361f84a8239e515cf29dbcbfde3d38648b73e7acfc72a0e2ced4ff2dd801c73bbccf5d34fb8aa065ec8b8bfc694a58f6d8dc00bb9e9a63e580be618a45228b
-EBUILD efax-0.9a-r4.ebuild 984 BLAKE2B 3a48dc7e60aa0784ea1761aac3494e506ecfcd74060faa446fb82097ed6472334279a3e0f26cfa2e12a2bf5eadc9feb2d418fe7885b8de316c5d7776d2fc013d SHA512 24ed551aeaf705a960e11be4813045c84fe1fe0653c0dd840faf7c428b6462e1410c7b5de8ed84e4655f3743f0bc75daa5eeace1806bcbda1a04c5588f7165f8
+EBUILD efax-0.9a-r4.ebuild 998 BLAKE2B 256b878233ac8e986a5d0c7b4ac25e02278edb762a7dd020a3a4be7a039d64365b830820af9626a1e9f44714f227b195bc3170f94f1eb425003972af37ce6943 SHA512 cbf87b250909606c4952b39f4dc3dfd0e4ea9be64a264be1f6308bd13da4037d824ac9079ff7bce8e2f6ec2b915e6807669112d9c422ff824af5a7b3270bbe5d
 EBUILD efax-0.9a_p19_p1.ebuild 1245 BLAKE2B aacc00ddab996e2d1384be6cf80b673ea54f6ff305d36fc40a86636fc4d68748f318c8c4680bf8d8180e9c8f9b9782f75e1a4285ecea1783d43c653fb5b9e8df SHA512 e07987dfb00812c5a081677905af709422f2194385d7d21eb3e2de6f7f42e021f55c768c3bee9bed42e4624b32ba813406d33dd765c2ef6f5c093a118ff09970
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/efax/efax-0.9a-r4.ebuild b/net-misc/efax/efax-0.9a-r4.ebuild
index da87d0c139a5..e206513ab3ab 100644
--- a/net-misc/efax/efax-0.9a-r4.ebuild
+++ b/net-misc/efax/efax-0.9a-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-inherit eutils
+
+inherit eutils toolchain-funcs
 
 S="${WORKDIR}/${P}-001114"
 
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 3a7a8a98fe1a..f7d381f3124c 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,3 +1,3 @@
 DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302
-EBUILD eventd-0.27.0-r1.ebuild 2583 BLAKE2B 25ea89312ae77318d0114a9f80e114d5c42779b277f4e66358d42f0ac3f611fdf03e1f4a3c9ff7e0dc5111af9097231fb6b081c370e255202198ccdf5094ab20 SHA512 8d2c26e4be8436eb9a2dccabac94eb662d7fdb0a2f8acc6c30401d2d0c9a0d58a3a9f7d44a5cfb26958d24234f687e0fae0e21c29230012c4c997cece551e413
+EBUILD eventd-0.27.0-r1.ebuild 2583 BLAKE2B 0923b6cf889ec63bd7e199033892e1e18b3c99422d576574d363c4617123a286493351ca07ce789fc7f99a0f4568d44110f11eeceb838500a4ef4efe46925902 SHA512 b88cadb2c5a2610943d7766056445f23bb7c79a33ca0e1d9d0ca894db9dca5e091f1e38248978f2f183d85fd3be71c01cf97ff44d442f3fc7f041492dca76489
 MISC metadata.xml 907 BLAKE2B f615133974e8aa1afefed00bf6d5e856b18feac63189f8c338de145145c10870de3bf45a764c53c9003fbac6215961ba9e4ca8898c0e2089545a20bc3b147342 SHA512 9132a923a1c3b140374a480473665aa85ab0a9d8f7aa74298a78b4905c5d2bbb97a0fa9d8564c600a9023f64e67151ac47b9443c55e6e7642bbebaf22da061aa
diff --git a/net-misc/eventd/eventd-0.27.0-r1.ebuild b/net-misc/eventd/eventd-0.27.0-r1.ebuild
index b7ceae38f1fb..d0083975d4fc 100644
--- a/net-misc/eventd/eventd-0.27.0-r1.ebuild
+++ b/net-misc/eventd/eventd-0.27.0-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
diff --git a/net-misc/fakeidentd/Manifest b/net-misc/fakeidentd/Manifest
index a0ddad0f0180..fa2111b3bc15 100644
--- a/net-misc/fakeidentd/Manifest
+++ b/net-misc/fakeidentd/Manifest
@@ -2,5 +2,5 @@ AUX fakeidentd.confd 196 BLAKE2B cda0ee38bd0749555a9eb51fabb123c34b9ee85978ab721
 AUX fakeidentd.rc 392 BLAKE2B b60185a59497781ab357eea73607222c8f116d9418204d6bf59e9eeaf3efeb231c27b4226b97b084b2ec09abe6c8da8e479bffc3dd8880d53f15360135c4cad3 SHA512 2831d5cf5292dbef0d0fd8f5b6aebdc0e753a8c8ed871f40b76fabde52ca65db939be4e1eef66ec0c73af0041add3c2a3a615bd16dc3fe7d89239d6cfe56f7f5
 DIST fakeidentd-2.6.c 23042 BLAKE2B f19b51f7a479d0d27db146b67287dcd35d0a9b771d081db697295ec936399b6d57a730bebbebdc969f3044bb8f58005450a526ad5714fa69208b14eff4e5fd08 SHA512 97f6cc70c5cbd757d250db58dfe01f0b82bfecd8296f26f258ef16cc612d7427350ad93740150bf2e8a3c09b92de3340b2e9612ed5c9b4a4be5550f0b18da76b
 DIST fakeidentd-2.6.readme 5589 BLAKE2B db9ac49c57c096ec245ec9ec9b0b06f2c01d21e5b6f7f71148f9e23d2a8b73be6e5178bf06090430d8a3bc65804ff636980873c80569b8e90a640303df890a40 SHA512 057f0ce278b5520d5db1edf3139a68ac15f36fde1aefcb2c94db59d1557905f4f437a0bfaa30f0714e3b8b4c1cf4698a245d2c94fc6023fd2e677cc76e796d75
-EBUILD fakeidentd-2.6-r1.ebuild 909 BLAKE2B 0d3fb13caa433aba8e4999a7438fbcf148e24a211e2295da00bcf1e2822b5e9f7865cb24084bd762044c2936b3d195322c50504237666d482e01db8a35a1a22c SHA512 6f95ac907ba9af367d1d5a6ddf5c9f764dfc2f634a6e212df48e6472000f8d17e686b39b2a6afaa65e7d64380128b700c550b4e0cea77d10214ff4ec3f453a72
+EBUILD fakeidentd-2.6-r1.ebuild 906 BLAKE2B 75febedd319c45ac4e8a15feaf95e9795a1b3b66faa59b023e9d6742e7070419d79965cd89d49632ddadbea0a3c7ce601a010bd8cfb12c054c221431fa46f4ae SHA512 db9ca7c58a985dabde30e2e2e7dba6ee7d6fa85480485325efc6547eb708ee506fec52dad82e9833bfa09c26bd17fabdc7afbfa8e98c057340de67f497448b0f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
index 2147d943c0c5..2d40b9f005c2 100644
--- a/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
+++ b/net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 32795fefa073..9471f5941c24 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,7 +3,7 @@ AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3f
 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_rc4_p1129.tar.gz 6774330 BLAKE2B 728a4d0f0d7ee4a6cf8a7d0d4ed6f2e0f13a76ceb1c16e7cb48ad0f3d6b6f36194839129bd57e73e02d2a6ae89a83d9d571f515ab2f46cb26f611424dd5b23b5 SHA512 407b06ca7607e01d52b7b89337dbcd5dc15633de197ea91443825672963cbb6d966a187dee022afb5f9979e8d08577ee62b681f37419e5b986f9c2f5e8a3e285
-EBUILD freerdp-2.0.0_rc4.ebuild 3001 BLAKE2B f8cb63c109ebf6534d5e0edd54585a05c071894b86275bb71363600ad38b3bc7e078fe430a6abde6c4aa87435b4a5504601932ca0a6f405df6851f969d41f6cd SHA512 714a0f7e111638585ea489f4f7a145abd88753ba52602926fa7779aa268c10991a552dee5d0264d08a9e89d567bd54e227b9edb30d841fc7dcf5326015bd1782
+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-9999.ebuild 2953 BLAKE2B 3dbd7d6b1d1f1b7ce4af442a0f4e5a276e4c5b56c511fefd648a100586749ad9a55a64e29af83929b189b02a0533bfe4df2c03002d91735d2c59f15d81f8ae39 SHA512 a25f0e46d7fa99969dbb8c8c6a9931759582b015ca711b2710fffd70e30e34565c78cfc6f35b21829a124eb6e6ce72ff7e8f028ef981a7503f26134badd1a2f4
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index ff5196d94371..5bd7f37650e6 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2019 Gentoo Authors
+# Copyright 2011-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 60e7e5aae6ec..cdd25187de8f 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -4,9 +4,9 @@ DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3
 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-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
-EBUILD geoipupdate-2.3.1.ebuild 564 BLAKE2B f0f6e6492581266e50dad9557fd62e363529e57fa5e7461a9cc12c4d35fca243703455d34a4f452427a60bc9789a93db73f033c9f0e8c1f88f823d82e1e63c8d SHA512 1c052646927f9b8352062c069b020f1799b787eaf781ecc2b74bf41b127a19d7e47c89b8c8f4e771c7262149fc455f33c462d236e4a259d27e969f9644a10ee2
+EBUILD geoipupdate-2.3.1.ebuild 561 BLAKE2B eb83fe3b18c53dec0fba3b6587d3b1e2664736e26c969211eb71c92555a6634814975e7b6761329a4bc65a0ba3ef609470bff167c33d90646eedfea2ab10bfb8 SHA512 c5e7884d3325ce2efb11c09ac6e81c5efafb28ef4b1a67493ac8daf80d6b50b830f154b6dd77c0bca22fe21760c4f0ee5712e6f21b8e07972fce56f7cd5c1704
 EBUILD geoipupdate-3.1.0.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
 EBUILD geoipupdate-3.1.1.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
-EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B ee680fcdb3c7f9f27fd362e92dcd9b3b5a2c6f1003cd5d52b44a8f711261cf796b4597429d014c352b193894abab135af8ef2b716ab89d21824a43f67b7c7dae SHA512 2960dad2406366ceac8bf104e79daf9d2dac8a37b89b515a1bf9349a12a357c81f2f1215431e37f8548e1df5e4adfe5540521e824a9bb10a842d82eae2819e2b
+EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B 52872fcad262f0e579aaaa692f5053756cca952d7992f5e1177a7ada17b1c93b731ca0fcd6b197be697e1fe22104b8621d93e3032ed0b9f70dc560dea6eeb815 SHA512 0dc1ed894f98a840d92f39e0f0f54686ce8742cb83e0c3b69e114e1d6389210794875d2fdc2f7053f2f86bd742536254940e30dd4a2081c9d821352299501678
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
index f751fdf1935f..1cdcbc7551cd 100644
--- a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
index 12bbd5889a0c..6935a3f3a365 100644
--- a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.0.3-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
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 11337328d6e6..f4511220f923 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,4 +1,4 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
-EBUILD gwhois-20120626-r1.ebuild 1359 BLAKE2B 57633d119e31070f33c38e5ec4da2ea97e69ee55710481a5e17763027286543487e4df799855cf8517081e79dfc916c17fa8400419e039eea6b8e31613337d4f SHA512 a377305ccdfa733a769ece7e96e121b234c525112d56b096da7135be0fe12ef54572accb206690b51040095df928e8e4c541f0b4347ea0015b35e88ff815efdb
+EBUILD gwhois-20120626-r1.ebuild 1359 BLAKE2B 8f3c390fb8f55e6c93a5a45a1f692ddd578320b4f4bbaf1c4101c0809f49e0dbccd27d27bc6ad13da94a8cd3814cf03fb3e570251b44f73280639bceb340a7c5 SHA512 35b357793634277a4176f378e69e2659788facc0a8b7ac60e864658a13a70b7fa327c4de3afbbc840f8409a8e1503e7db232e9559e1aa5af4d234386091ad30e
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
index e386f4358d20..ba57c815822e 100644
--- a/net-misc/gwhois/gwhois-20120626-r1.ebuild
+++ b/net-misc/gwhois/gwhois-20120626-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
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index ee4bc6417ae5..426a7b731f1a 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -2,5 +2,5 @@ AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe
 AUX httpie-1.0.3-test_binary.patch 782 BLAKE2B 1e7e63fe889e2b5ebcc814d681652b718d49c2bdf09d90e70c10cf2f7f6cb88ea70509a98a7e56d6b84ecfb84b6b8e5158e73c8d322aa161c8de79e6ac0332fe SHA512 ed917989c3f04aa213739563a6ccd34da413798787cff6a9af07ea058013c6a96c06dbf1e36daefef45faf571983286d3faab869b7918b29239278b54e5570b8
 AUX httpie-1.0.3-test_stream.patch 722 BLAKE2B 8ae3ff08311178f40d6e4156fc0fdab443e1f2b76a73f8f47bdffc2b3f62e506b9a60e856ddd358da36e9f45ccfe056ea18906f627c40e20313bd75949711f04 SHA512 1a5b9a010cba066b7fb33e7222c343271e7660f460e2cf23bfcfbb1ad3e6d1472e4dc9ee4679d9c893c40ab1e8dc7a652e2209167cd51f6f5489eac70be03d99
 DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7
-EBUILD httpie-1.0.3.ebuild 1290 BLAKE2B 4c7fdd918c3fff58b5120efc5c05a19e323ffd9640f574ae5fc4c6cc12b35546f469d084a526e70c2bd2e20e485b22329c47b2d6ff0632751148c04e98825bd2 SHA512 4e29155bdaceaf75c573a5ca3a802d8a21a5786aae53b682c73220c1acfe19ffb715f450816a0d6f2b177e95f8d351c1194dd2ac8fc9bc14c1f434123880b153
+EBUILD httpie-1.0.3.ebuild 1280 BLAKE2B 8dc29d0ac813e1a560329dcaa81a7d09a9943ab7da68cdfd8fe51d78e5770b488cfaba540d37ba846a28a4dea2637f6f120e139ca77781ddf8b797024ca74c86 SHA512 7fcd9f49ed92db12b57ad9bb684113260f941ac764f329616f7cb0c0d758c1c0ece6611ac0d7551243890b6a6991af3fa45b8e2a1ab594da97eb5dffa9ce9cf8
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild
index d65556fc1b0b..4c1b60f7651d 100644
--- a/net-misc/httpie/httpie-1.0.3.ebuild
+++ b/net-misc/httpie/httpie-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit bash-completion-r1 distutils-r1
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index f4b96d657a9a..231771bb85d0 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1,3 +1,3 @@
 DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d
-EBUILD ipcalc-0.41.ebuild 533 BLAKE2B 8cf12a13c859b91ae6f3e238b36df23f684b9e3863accfd9342ecab28acb2e6993bd6eee780f489dfd765084a2f0b4bd241409c9fb7393d8ab6a12eeff832a49 SHA512 306f69e3a9d82498e42178690aead1f39d74c333ab80c375e7eaf6368ae8b93e489d5b35e943c40f9a8a1a8f08cc8d98cc2976bc7eb5fd715cc83067496c09cd
+EBUILD ipcalc-0.41.ebuild 530 BLAKE2B c4956f9b80af75a31afb5f53eee5ef49bcc0687ba5eee6217a44ee5411e49bc35541f1d06e8bf94b705e854b409f2490d57e93df60dc5ba53dddace71f491410 SHA512 4b815fd302eb8e6cc42efc9adf8034cf8adf966f12e4497f8ef2af3b585e2df2f080c4d52a102c13a28f6fd0095b8a97395d1b0e1c76568cfafb3a0a2cbbe449
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
index 955b53cbea80..98494fb1f505 100644
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 486601716028..1e9369561e4b 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -10,7 +10,7 @@ DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef6
 EBUILD iperf-2.0.13.ebuild 743 BLAKE2B f4b9a4c6829ee8633c462cbfe5e1461ee3ec2d7b86ed3a6cdb5c54751d566c1ebc35898a5781db563b0dbb499205b6b968007dce69ccbfa0ad5f4618898dc0a6 SHA512 7f7bfc1135d70d799ce97276967111e132a1f7b80ecc786b060dc5fad12fe0b1cc838d4919b1ced3fab3ac96ac0eb6d5a417b8381554217005eb6da49f3f8b3b
 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 5a675f50e83bff8d761c2925401ec1d134ac42da79b7d13eb0ca6b8e48786b9d579592400a08e8df22e35360d2067f3fbdb3f805c2f38490462d0ac7f3da5db8 SHA512 d78c211a9de6db728b9456d34825076004ea71cc0fbbed53c63f0de62383c3385230ecef15f2670bf7802d6e01ad50ea6e1a087bc61dd60812ff409a5e8aec87
 EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 6d99e56fcace17bebff7791c0f642d76b5723126091fb7e2583510a5e685c47b168252ed3cc2f0589da0093064425ff6317dc35e4c1ed5a3edbba1bcd87e7d94 SHA512 7f50ca3896efa0d65e69711cd8dd1ce532e3481cb3da77a7522cf66171f46c29195d0c12b396c1c69a1af3c8133ce454ad3e7b8562759f8fa282d886b905ac28
-EBUILD iperf-3.6.ebuild 1006 BLAKE2B 1f44e5856fe15027bfb966c5b22e961c3b0290d9745c40cfedd7389b006d67a543318050ad515c70591c328604a928c1ac1bb3111a9d0b9f8b720d336f7661c1 SHA512 0d98e529e62143c82cae68feb2595bf2192dbf4456851c17a7f8c1cc2ae40f2c7f528bc7c95fc56d27b67eb7a4aa37e798d270beade6fb3800c248d23d99e4a4
-EBUILD iperf-3.7.ebuild 970 BLAKE2B c6609695e2a17234139141840627dd35922e7a1689aa5ec6d798bf450651af4bd8d1cd21abeeaf5fee76439f1509d7d3b0f7d6581dda9a6a0d6fdaab6daa4d7b SHA512 36f41ad3014644cd1f208fb1bfae6547c9f334a7c7495857c6c1443235837069da814985a979e748f12672fb5331dc506b4b2296ca90272a8754cee71461db9b
-EBUILD iperf-3.99999.99999.ebuild 823 BLAKE2B 4e56f70792a7f34ab84c23370d8da8ddb9c32abd27ee0352ebd48f30106f1e63d469181218bef96ad4403cdf1b50ed3f1703470a84ddcef3402cc95b12600090 SHA512 d07242508a0f58c9eb25396e81e9b5559da20ee5a377a78597bc868ce4e04b8e5c61a4777b8d45239e552f84d3bb804e51800f30b6ee00840c6fd71f5e15d302
+EBUILD iperf-3.6.ebuild 1014 BLAKE2B 803a8ddecb82cb8cd33b5e16c53db46d8fc6d8b4ba8bf6ed0412a2be9ee0ba4f97cea7b576a3ea989f04fe1eddd3cceb0066e8d0882c85f19861cc13eead41f3 SHA512 09d1d479b898ffc662fc6108908bcf84a596365f13017597246a3476ec02195ca69c49a6d3d053b771040d6289d3a36add2c328ed6ec007bb0f973b1b58dc2a5
+EBUILD iperf-3.7.ebuild 978 BLAKE2B 40dc10444e3c2abbcb6a3f15ad8b8df7f9c4d2f91dcee14a5cac6ad4cef2282f37bcfead2576f6018af7652a7363e059cb5f202c21f42eb80f4a196ca39412d8 SHA512 791e853b3b2b810a95b0fbe24230fe56a885973276aab4c5e2623ca027a8d355f0762e711ad429a7fbe64e946c3e01c91315125eb1346156384385721e857982
+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.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
index 20d890f1ac63..401e01a7af99 100644
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ b/net-misc/iperf/iperf-3.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+inherit autotools eutils ltprune
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild
index 2412a7712334..45025840cf6d 100644
--- a/net-misc/iperf/iperf-3.7.ebuild
+++ b/net-misc/iperf/iperf-3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+inherit autotools eutils ltprune
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index 6e651505943b..f50078047e0e 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils git-r3
+inherit autotools eutils git-r3 ltprune
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index c66be774c8d5..becb8b106725 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -10,8 +10,8 @@ DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
 DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
-EBUILD iputils-20180629.ebuild 3969 BLAKE2B 20308a601874c7b4082f8c466734341c827a9bd241ca64961c2d83a4f8b7ec38119e2ed284b18ab2c98928c3e8f06690f2c726047ef6a8f75f442a85719a61fa SHA512 56aa930b4078d61e9b6cc05ee7d09dd2076da97560177ad49aa134c94e1b1aac39543a0217bebf4a4fc59ead143a7e81eac52f5bfd658e9f11ba38b5dd1de91d
+EBUILD iputils-20180629.ebuild 3969 BLAKE2B d48b246f78d0da70cb869550a250c83fca055b5e77ec4a962fc6ac615c40c8cbd737d474b3bb042d848870f3ec8eca5fd75484142ab07aa433cc606acd1449b5 SHA512 52fb6be372a3ca7ae303cd1a1cf3599a52304c9d593a2eed32fe50cbc75f64b1d413a97451c6f9129c0a45a5cbb57888d2aa8c1bf8135b30b278de85d3923f94
 EBUILD iputils-20190515.ebuild 4923 BLAKE2B e7c4bb2ac6393f93e3294559091b4a339a76a2e21e0b787b92cf631b9799486a701ca5e5e5f1b77910a9edecc00b68661f5e789f336fce9c9321ec3656e4faa9 SHA512 48037b05394e88e60ee399d9560f59529e3b195e10b8a5137b11377a6e4240a11aa2409f0e5d74ac753a72fd42c414edff975fff78d77c20de6e46a9c7c116a5
-EBUILD iputils-20190709.ebuild 4836 BLAKE2B 9275ac93aca04c5e51a8595945f9e431f5acb25767952ac1b41cec684d30f594f3d69838b1b412c82f6e055e10340de905c25f3fe0e9631afddce5cb89a5c4eb SHA512 a5db81e22fd5a98a4aa38c4e85e69205bb8685c31e172ef171004716b3f3730fccfbd2be7edfc13674013fc1c9ece4ce5126d0a19a40d1dd72fcee75b250346b
-EBUILD iputils-99999999.ebuild 4843 BLAKE2B e22a34d1ef274e826ea81b56ea96a3d5115d489c5693196dff526637dfb26eb650af874b05df77b0d4350bca1b0e8f1395020ef4e513a9da46da51245b08dc1f SHA512 26d8ec2206ee720aa02a9feaf9e1c8318704ea2f85b3b7d8eb90ce9608ad55ad066f87959f121a8f7f771d006eec70152c7dd7af9e69e538d81a3b558aa180cb
+EBUILD iputils-20190709.ebuild 4836 BLAKE2B 55184f1602f8880d6d19661768a573ae4af056d8283deb4bf0d530902eca962c6c764c4e9e8a33251805197881b6ace917b996405640968dc63818676ba60222 SHA512 c86911890d5848509a3bcdbb3d50050e7ee8f95b9bc0eb40fa7f502edcc49ef554fe9c1ab14654432859f0b3392a2efe662bec3f7c6c3cd9d4b3f6d18dadb066
+EBUILD iputils-99999999.ebuild 4843 BLAKE2B a866f2ad14eaeabca1136cf5376da08c219f3106bedff2cf880936c6afb38edcf04ed9852111614f2bbcf9b4d2b34e5bd41f0fb50c5572394666c604321b904f SHA512 d93c23ba2a5ffcb252c5adbab9502ac65e0628a8a8847bc2cd9ea720253eb5f96206326be7f605385a27b0270d5a2baeb88955d6712f8cf3d28b27e12d060f52
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index 03247ed260be..db782177e0bc 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.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
 
 # For released versions, we precompile the man/html pages and store
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
index 1c478e19659d..a0cc3dfdbee1 100644
--- a/net-misc/iputils/iputils-20190709.ebuild
+++ b/net-misc/iputils/iputils-20190709.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
 
 # For released versions, we precompile the man/html pages and store
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 228cbf543703..c93df8292544 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.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
 
 # For released versions, we precompile the man/html pages and store
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index f4ecee8477df..5c2feaf436a4 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,4 +1,4 @@
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
-EBUILD jwhois-4.0-r1.ebuild 684 BLAKE2B b84354a578a418db3e40df61cf287e0e78c637731a444b9c1e8d29e09e557d103e1b653591117980e5d860dff7c33c28856788151682a6e01d667f1d408a9352 SHA512 19150b6308b749a47b6096576da48a9efff2c5417e47cec73bac21368b5da04e694d565e1810d6f6c6adfb1a135419f6b30a44b9b7d5506e41382cfc6c9264da
+EBUILD jwhois-4.0-r1.ebuild 681 BLAKE2B 785e3c729d1366c5c114f3a6a01bc87e45b1e1268a37fbb1cd21eb69f5f74fb9f868152ec90994889bc7635ad4109840a228c11f719277554c99d89c823bcec0 SHA512 61308b752f2053f67084bbd6154587a8f6b845378db1cd601099a70bf2c8f28d9a3e89fce9aa0009bb668316cca61ae144d0d21e72ffb6a513a267e80a57f614
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
index d2bc0d90e80d..366d00b2c380 100644
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 676d67803264..679965d39db4 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,5 +1,5 @@
 DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb82e6ea9b434c0901f2310161fdc504ba9ed728c942c93b21069954e0ab87319f949cd96fb135c2e4991b8cefa SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
-EBUILD keychain-2.8.1.ebuild 662 BLAKE2B ea6a84cac2d820fa0bc28ebfe26445f4a49b91d8aae4d95198369a3d60c1bdc7d541f19447e1598760448401b3bc5f68524fd42f28edcbc89a6a95bd48144510 SHA512 f638097711f9da1462cc5630120d8c1ccf786b8a4f2ffefc7368c7094eb279fcbb3468bf29161243a74625e48be26c31be3eed151fdef4d9228a68aeced44e1e
-EBUILD keychain-2.8.5.ebuild 663 BLAKE2B 8fac253fc909bf69104267186742d36a80be7f9e1a833f907cf3be4a0db3ebcb4dbb68d9bc71ab7742d3131968253dc79be214b7c6414f19955d766169e26162 SHA512 e2074a73d01e76258ac1f1cb4f8fa6a2ee55b0e458677d6c81f2bfaeb8612937edba39d16f318c8e811b3069a5ae3fec272d34593249d5c1b42fe80cfbf186ba
+EBUILD keychain-2.8.1.ebuild 659 BLAKE2B 760b82fb9cdf4894f8b6bea7463c07de13b696511d0f2db2fdd88ea3e783d27af6eb704069852ee87a7e498158817e3ff8bb5e221e9cb8d608de5fa800fe4673 SHA512 6b19a5fadf2d30f024d8d5c9d36b4c5de8ece80c846b1140f4a68a3778c9de50bddaf50a3119a8efb194392bf7e4b5ba5b293c543b263d1b535ef9a5921e5f58
+EBUILD keychain-2.8.5.ebuild 660 BLAKE2B 086540eabf808b841f1ec6e7ad74b6919a284dcec0349ebf33d380ddd2ee6ac3213b0f68368a26334b265afaa87f39ada4dd5ed0814df71ea3c51427b82ad72f SHA512 441b515f3356bde6c9336b0d21adf46817dc299261fb5468e910faec332294ad702ced41f3e276e7ae0da3149bd4f2d85de944a75927031840afcdd6ca8c1065
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
index f7a1dbedf810..ac818ce2e562 100644
--- a/net-misc/keychain/keychain-2.8.1.ebuild
+++ b/net-misc/keychain/keychain-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 53745bf62c32..9e9b72b800d0 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/lambdamoo/Manifest b/net-misc/lambdamoo/Manifest
index 49b55743103c..da75108f567a 100644
--- a/net-misc/lambdamoo/Manifest
+++ b/net-misc/lambdamoo/Manifest
@@ -2,5 +2,5 @@ AUX 1.8.1-enable-outbound.patch 451 BLAKE2B 71c9fa7921e258df1b785e7b5d92eed3b380
 AUX lambdamoo.conf 185 BLAKE2B d681b52af98a278c9ee4c4485afcd0919f952e5a5cd1740a4365af233f60c273833c3c35d9a65f4e1e48ebe99d93e9c0ee307ed8b052b97e41abdd6d8e4a3bd2 SHA512 fa96885e674b571c6eccb682cb4ab47d09a723a1dd82d6a11a42e5760c2b53ab24919627823ab9c4a2aeb5d3d2d41984df3eb9f3de382164b062e024639ba2b2
 AUX lambdamoo.rc 1145 BLAKE2B c6b5b7d25644c0a2832144a6c8b6be3af082d9bac30f5916c84a3ecac983556095018cbbbdbd138c046927873c9e52cbb02560ef1b84a553b666f0c5514534c3 SHA512 ce0d41459aac2249b2982d5bc174810e2fd5a77ad5c5f102929c350306bb799cdd9582926dda42c062d7f60b77ae59dd26d7f32d249193d13e9b9feb888ebd96
 DIST LambdaMOO-1.8.1.tar.gz 363803 BLAKE2B 0bca69eff651911d97f1de66c93aaa0ebb14e199277bb83171e0855313291501ef501272b58a0524da1e3764359f0c6b79377d021db0b45097ed29674793024e SHA512 1629375d74c67851e20ac007411261bb24c642249e4ede0415580b5c87e0df77b23e8a70b249f734ad3b5bc3b8859b5f0162dc55f69b9756ce2afa6a9553b7fc
-EBUILD lambdamoo-1.8.1-r3.ebuild 928 BLAKE2B 8bc36e61e619bf4539182d02e6b227d3d66a1e1fd4a19fae78cd48b990b51d99f9ef9eac5fe87d2d5d6cf3f433845285937a7d9d40c38582ff4a11865b5309ef SHA512 07e89e0752a214274f0abd6fd88e39918c3ec5d0f570f0e1fdcf1ff6b9015b7e462fe3aaabd88d84bbf67ad2e0fab6b619d32932f72316033c87662c4d57f482
+EBUILD lambdamoo-1.8.1-r3.ebuild 944 BLAKE2B 40bda30bc206729333d829ca746c36df07608a9bceafe0003030d4d9a1b386ef4d963b88e191eef9f8a79e5337d7cab0100a617c564e78b2c277d79f3e6d8cb8 SHA512 2fc70f883bd1824a2e7b0bfa482ac1935516d1df273bb025ab987d3dc1819b2a3a89e12b6e05348684e5a25ff66c4d488b3e1f384e6147363ce4ce9ac736c5f4
 MISC metadata.xml 246 BLAKE2B 6b18c71f3f566648546a95f1d92b4579d58d2041f249cc1fa2a5c7f6e1bf70b062ba78ef7368e0500e71ef4b25e7e6b7d3b415e161d493e37946e5577cd6610b SHA512 2e061a29f6379f4379aec8e6ba1da5b4265f6594e0a414e7e5a04fa5b3ca8ec3c2487f86049d234c37221303050050a8a9264c8c08fe3992c0a0cb2ecfa74d6e
diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
index 447f42484f06..41acc456a60d 100644
--- a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="networked mud that can be used for different types of collaborative software"
 HOMEPAGE="https://sourceforge.net/projects/lambdamoo/"
diff --git a/net-misc/linux-eoip/Manifest b/net-misc/linux-eoip/Manifest
index a7d1034e5221..51247c378625 100644
--- a/net-misc/linux-eoip/Manifest
+++ b/net-misc/linux-eoip/Manifest
@@ -1,3 +1,3 @@
 DIST linux-eoip-0.5.tgz 657013 BLAKE2B a6e49d2c342c94b354e1bb35950b3cfd815c8063854a836c1a8bded7ff8b0c745f8d244f34b671843e48a8867f4a0e2df808412066871d0cc1986ec19631ce25 SHA512 a8ed24a0bc4bf6dc97b125ece4ec6b46d20ee1aa09a21f7127854394c085143d4cf1d973e544869bbe6da6de86df7ee6c6901ca1e0dcf9c1610d5d35fdeea7c0
-EBUILD linux-eoip-0.5.ebuild 699 BLAKE2B c738ce7b705a85cbbf4446de25946876c8009126aae7cf4d09209237c4d3deb840c3e1316c87f16f3d7e412294dd7ff38a9956a5f83f1be14adda8c0101387f6 SHA512 2f9cda3cc804a7fe4e1227fb2d9941ed7fbd78e843bb4be461ad9ec3a44efea5f733dfd9b3d5ed87bf49b154844072170ef4d642f57cfb91524822f7bcfd84d5
+EBUILD linux-eoip-0.5.ebuild 706 BLAKE2B 26c86fff637f352e3528714109273eb7fcb09975bac17b95280aee632e2daa931897226ed5a9b4f6c1077c78a547bf729c5ce17e6674bc7b1d585ffd63181b5d SHA512 ce42632e8e60a0442eea4685906c437624d90ba692f72e3a3be22ee9591b00aa67c99e290bc4bd24b5480c209c43960864505ad9f49c38bbf066fe25af247a4d
 MISC metadata.xml 374 BLAKE2B b86ee967f256dbc5d33fe73314a2ac75e75b74e363457a2183c32d0a887d063067eb6f07565f430a99a563c6e6f37b7aa0e303c1fead29ee4fcbaf069f1e9ebb SHA512 04c13ccf8492060efa30661a15a80d93655aaf5dafc3135734b3f229912ea5dd52ab0b51fe370e05881a26d6c65514bf5edf9ee547a6ed1b0bf4763dd89fef42
diff --git a/net-misc/linux-eoip/linux-eoip-0.5.ebuild b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
index 89b53995b2a9..715474cb94c2 100644
--- a/net-misc/linux-eoip/linux-eoip-0.5.ebuild
+++ b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-inherit eutils autotools-utils
+inherit eutils autotools-utils vcs-clean
 
 DESCRIPTION="Linux support for proprietary MIkrotik EoIP protocol"
 HOMEPAGE="https://code.google.com/p/linux-eoip/"
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 06b86dca1f9f..cce2f3cae4d6 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -2,6 +2,6 @@ AUX lksctp-tools-1.0.18-install-sctp.h.patch 335 BLAKE2B 513aca706f701591bca2e08
 AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46215fcd8bb4f1b7cf9e860f9574c14d4f96f5f535f969aa827296e38017f3c56831ce820a2c5469ff9ef6b0afa39b553f SHA512 f64962208c270fbf39ba73b71801c27f5c2e45e4382c53bf3728e14c1300970b0d2a86d34132a4e8d24f8eb694bd234b11cefb7cc31eb232557d090c34d830e5
 DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
 DIST lksctp-tools-1.0.18.tar.gz 560302 BLAKE2B 6151109a0f43044048ff64a6ca021710f28e695017b79513412a44999ec67bdbe7cb0bbba7d5e0deb28b8fdd097379100046ef77508678f726f18944b9799f22 SHA512 1d7275fadc0f2270865307cff2645810e9bab6c1a97e70be6115cace737334dbdd87a072fae25b89dd9cac2e05974556542de70ea8ef70b9e4f14873c82a5055
-EBUILD lksctp-tools-1.0.17.ebuild 1259 BLAKE2B 6b9cb9c10f012c0d6b2d8e29c4dd5f312278a4b0e6d56844c895f6c611bfed461e2a91a7c8adf488786c4f835dad98acaece83aea0acc9c34443359dd8802ae9 SHA512 ec01fab740601afc9fcd2d55a32748ea0b088c3a11f580d72a9c1b2222a23847c25a83029eaab8cbc9a3cddcd2c28a96f9c8a9206981c7d68f72b76f8c98634a
-EBUILD lksctp-tools-1.0.18-r1.ebuild 1390 BLAKE2B ccf9ae161867e71ef3842ae0d5cc89dc26bfca0fac6c0f2c455f86aebf0187dfa8d09d278bda71aeab9e129297fe199995a792f5cf847e08283bac164152043b SHA512 ab17a01562363f2fd37d53ccb993bfdd8d39cb8682b330a3a375a97ea667093bbfaa57ae28ffa8db4df06185ee2d3a1762a9632a7a9516f16c0b2dae869fca28
+EBUILD lksctp-tools-1.0.17.ebuild 1259 BLAKE2B de38f2f5fa016f758c50ab838b79512505f0331ee75d1e56db4269ac49f3d8a07cd1994159f39d108b761f4ef6bc74da7d5cfc264215dfce7d3d5e78d031c02d SHA512 19a60c2c213b4810907d504243c7b479957fa2be4ca2748773ebdae738d847918ea4185070605b7c5d2a7cd4e422483326c684f0116d5cfd52ea4791f8334130
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1390 BLAKE2B d2bb828a8c5448fef14bec8074fed95f224baa12bba57f407305c739b6c45e9cd239c1a15c6f545e6a1998dc922ea48230899625d2c555db68334a98e85846d1 SHA512 f19396b0994a99ffccd96f155bbf8e9e74ba0b0e2b9e95d65a214327d7edd094f6830a058e2cdb5c637a8e6001f84f176d38c3f076160fda32a5d96f58ef674c
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
index b3435dec2c9d..216d04ab0560 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.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=5
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 8ee3b73e8976..b8c39e9d66a8 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index b594cd8736a9..85e54b11cbf9 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -9,6 +9,6 @@ AUX lldpd.service 205 BLAKE2B 787e9d19def1d4d3cfe207e928b994d46b4fda5d2431ab147d
 AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c0438a55899e858c98dc3d49714ee07cec4c921d15d955fd0c34f6dfaa4f3667bc4c0e9dfcde SHA512 58b11cc9241c4da25bf53da31b1ed64a489a7bd0998bc8a395659d77975607fd6ab035ffc830ddbfe2e5be244ff7c308900358452aee728fd56a4a7d4e80ffde
 DIST lldpd-1.0.3.tar.gz 1605563 BLAKE2B 968d1c2e046049fd9ba9e9af7b8cb4f531fbd99f41a9157679f3694f800b0da1a4dd3b21feac583fa5cde3f57b022e2d6ee543ea349e1136037ba10419e3c855 SHA512 bae121a707d06726830dbb6b45210c1ed23aa2a99349a68d088b3ae3109504a6b462c7b0abf8543297083294519be2878779edf1a41bb73fe002bb6c9f966ef1
 DIST lldpd-1.0.4.tar.gz 1607806 BLAKE2B 28fc45b0f2fe958e5d0aac370b54fda286aa4f04c228eeb12a2f60ea6643f63a7de3831ee3f0a060cd4de3849e75b58fdb6a868dc1aa0f8dc4b516fdd4f4ead0 SHA512 a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9
-EBUILD lldpd-1.0.3.ebuild 2567 BLAKE2B c738e953259ac8d9175d96da8914a3c7a194607bd0d26d3f7228a389cfcacd9173636403a5aa54ab19196e52231396496d3ca6b6e49864160fdf8a133b13db46 SHA512 1cfba79856d8988a9996b95515a79b1f13761e3e9817c8ed3f9eb2e605d4edb678e5f1bfd3797e3503ead272476d82d07d5ade4e184b84319c798a5a39b4eb26
+EBUILD lldpd-1.0.3.ebuild 2575 BLAKE2B cd1daa54be890c1b259525ea1ed7bbb1e23b54e08a2ff98c1f43a7f17ab9d4df3e064148cd8cb48c90c87571cd841a94ec15321797e9522af58095afaef16b95 SHA512 564899e0e270b9f3ca37f3b4df5e45efca7776b32871babbf8428dbb063978839114d7362a76feda7e7995ab0e6ce42c94a8ec518d60acbe4de98d7bdf791bfd
 EBUILD lldpd-1.0.4.ebuild 2549 BLAKE2B 0e63a4b563b35ee90072bb756036300bf5ae2a53ee0fd7f9386e9a3c85ac4b0beec271e98adc8631eee38b3c86c11101e9ffa826afa738a8a787e5c941664689 SHA512 1d33c741feb750d164449cbf61978fd520a229e1180939a68b64233d76adbd605024520eb2d093bfc9836195ab62a8751c5ad95f9d48b9ba3819751ebfe83d30
 MISC metadata.xml 2768 BLAKE2B 61820f8fee8d710e94de066011fddc103a3ee606ab7a587e44ba1b4c414fa20599036be8e9a3d31b94b4e55a3396423f9da7ba3b5c08e6d9966024fcf552121f SHA512 c99072e81bdbebe79208b85dc13511d25ce8116faed76d5b8ec8485775801761b23dd857edbd7025b01572ceaab9f32ccf77e95a348426ab6b6835ffcc99f511
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 0951ecf8cc02..48ccb73bd035 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils user systemd bash-completion-r1 autotools
+inherit eutils user systemd bash-completion-r1 autotools ltprune
 
 DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
 HOMEPAGE="https://vincentbernat.github.com/lldpd/"
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index feb424ef42fa..b8d1b26d7c37 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,6 +1,3 @@
 DIST megatools-1.10.2.tar.gz 103868 BLAKE2B 102cc4249706e199f23be3d91372d98dc9d74389c79796638e77fb65886c3561eb589717e00d724de0fb81bfb59acec8207ef4782f6037b34a0bad8d76ebf5db SHA512 6b8a5e92f24c9396a5f6572a0c67144216b75f9af9888dc41273d866d692eeb1f61d9337f74bd4c9e175f79f658f0f41de186147a4ede858797f2dacb98d0b97
-DIST megatools-1.9.98.tar.gz 83684 BLAKE2B f5c2a8559c7d4eb79eab2719fc63fd4a8c8d2acbf1d14e9de9d966a32043f291822bc5c67c9a5a63d5f9612ae3b3e3e3054ddf2f6b7695710ac6460021f5dc75 SHA512 0610809e16d135fd7cc3be45517a342f9800b098ed306b4341205bf0359832b4cb2a64220c84d5879cea6c4074229920dffd461824c93e08b492080ce87e012b
-EBUILD megatools-1.10.2-r1.ebuild 731 BLAKE2B 604b2136c05fe4cbba9c9f239594dcfbb27c8298790d57fad65eac6dee29fc731dc213a6cb025b9762ff593ac8bc0ff7c4618f5694fce12db4c1f4a47ce23265 SHA512 4c45a1a41ca31eea69b5287f0f65d408d4ad38d181be29e50e61ca113c29b26ef9035c1693a6fdf7e9a86528f2984d95364a8641fbe664c6f5e767c2dfd8b40b
-EBUILD megatools-1.10.2.ebuild 795 BLAKE2B f36f8518b874bbea386451307a0b90c5a29c6da745bdeb014596ec5a5994e190225e18165cb17380aaf662cb86b1517845dd567c96dc71e1ce75725821abb20e SHA512 3077a23921e59316543ac3e5aa881213636f22aadb8a762c33cd7048d8db113eed5e3b6d2c06e0578f10073f4b6154583d395c524b357f80e90a7f4c0aa22896
-EBUILD megatools-1.9.98.ebuild 798 BLAKE2B 0f6c5d4fc2b8c5219ddc6c9f139601105430a066b41b2ee034d833bad57bebcb7012ba99e63ae8071ecaf9c58cf7f29ce3a1c5266f08cb1a585661755ceb8fa9 SHA512 21b483593d1c135208303350f36d8542bcdaa88d897c92ab5962d7c9fc23efa61d7207b1b3f97a4d277e48087687147dc6cffecef81d3b34d60eb2fe442bcc70
+EBUILD megatools-1.10.2-r1.ebuild 724 BLAKE2B 71b9ccaa297af4cb61742df4120ffe2cd4669d8b9e6a8669c98269fb7e0d6cc6cdc7575c1881beac94f05e7d7e651d3b7b1b2cc38bda7b3a2ea01c75542e564f SHA512 291def867d45c28e06077990a4db40e49e5a4532add6c351b747540a5e1bdbf0c2fff16bd8c3c8544b83957922b923042c1f7ccdadfa2d39cd71736d49e9413b
 MISC metadata.xml 531 BLAKE2B cc1cb4fb594ec4ad7a48eb547e2d15a3f060b000596f81dcafc23d0ae50ee1a979a18f65747ace522ebaa315ecb863697280f09e9bccf01c4c695ccbf29b76ce SHA512 b6dba0febd0344a6bf61a64809b60cc67ed3ebbc48a363206ac5c86547f6da6cbf573e3e55734f6f966820ba01654109e9e0535a5434e62c461fb87866bb6c8f
diff --git a/net-misc/megatools/megatools-1.10.2-r1.ebuild b/net-misc/megatools/megatools-1.10.2-r1.ebuild
index 1d9b22e67f63..7228227990b5 100644
--- a/net-misc/megatools/megatools-1.10.2-r1.ebuild
+++ b/net-misc/megatools/megatools-1.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 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 autotools eutils
 
 DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
-HOMEPAGE="https://github.com/megous/megatools"
+HOMEPAGE="https://megatools.megous.com"
 SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/megatools/megatools-1.10.2.ebuild b/net-misc/megatools/megatools-1.10.2.ebuild
deleted file mode 100644
index 23fe11cf1901..000000000000
--- a/net-misc/megatools/megatools-1.10.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils
-
-DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
-HOMEPAGE="https://github.com/megous/megatools"
-SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/openssl:0=
-	net-misc/curl
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/glib-networking[ssl]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-warnings
-		--disable-glibtest
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-misc/megatools/megatools-1.9.98.ebuild b/net-misc/megatools/megatools-1.9.98.ebuild
deleted file mode 100644
index b802483dd5ad..000000000000
--- a/net-misc/megatools/megatools-1.9.98.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-inherit autotools-utils
-
-DESCRIPTION="Command line tools and C library for accessing Mega cloud storage"
-HOMEPAGE="https://github.com/megous/megatools"
-SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/openssl:0=
-	net-misc/curl
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/glib-networking[ssl]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-src_configure() {
-	local myeconfargs=(
-		--disable-maintainer-mode
-		--disable-warnings
-		--disable-glibtest
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 9fd5782f13f3..e5b00a0f04a1 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -11,7 +11,7 @@ DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c
 DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
 DIST memcached-1.5.21.tar.gz 532631 BLAKE2B eaed8eae81c7874c48dfc6df5611d83d21a69a19c9b79bddbf909d15f1c84b3c03416002bf0beff07a8e6502741ad6f776e1cc86cf4b16840ea83c727db3c80b SHA512 4ade3e15e6821b76f086b4933f5599248f8de7e7b2ae106dc8ecbc8a5073a1966e4c3956413fd57387bb88fca2c0e95b9a3ce7bfce19c42bec584a3268f06998
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
-EBUILD memcached-1.5.14.ebuild 2931 BLAKE2B 9e4f8e22c94709042a9265ecab8d60996e003e7e0e714cb7ebcbe6af0c045c343a84534ceecd96109e4e0e80a0e61ce2b2c268ce24965c3ea4b590f190406717 SHA512 cbc782fd7755bdd8e22ab5dd16782c558aaffcb94121c9b6034d668a666f5b56bf980c43eae0db7d6995a963dac5cca0b80b818bd5f561fc32491cf0c8b3cd39
+EBUILD memcached-1.5.14.ebuild 2931 BLAKE2B 7e7051a674ed35ed33e0b1b4ded10a9191c408ee49d504c9fd8b5a039428b3a8db13402702591ec66ad642681416902386084b85702093864700c8e154b7c4cb SHA512 be0362596b9d6054de0423d6b450fb883889e2f548d4c2a105e3b26a97fea4194100b18ab64fa52926e5f5b4dce663435200e12857d2967e9e2ecd4e0fc5f8ae
 EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
 EBUILD memcached-1.5.20.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
 EBUILD memcached-1.5.21-r1.ebuild 2968 BLAKE2B 18bd2d8ae49c0c0ad850e316b388ae752d782ee548a85924c0ef6163d4ad6a13d52f208596dbbb2ed23a31164a69f8ecd7efa091119de26c588dfac044b30099 SHA512 160923ef6bb1ed42c839ba16473188af5c86ce9db62c4780bae33ba882128a58f395d6b598fcf7bf10d9c1187983789706dc4f75922590e0956acc3bace4c921
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index f7f7598b63c5..a2494271f3e9 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 89db99342d6d..3b88b0182a65 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,3 @@
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
-EBUILD mobile-broadband-provider-info-20190618.ebuild 469 BLAKE2B 51a4da1cf2ba28efe8b69d6d952b75a948182686ecccb870f6e9497405ba03dc561dc50db93f1a08aeb6c74b283c0b0f56b9d3969af524e79655ea1c13f387ad SHA512 ece8507d7733d64ea322a37b338a65b46b088e53989ac945aaef0977eaf87b6f89a4fe1d238dc7dc4ae704a695989bc0ecf52c63c6b79b5511324be19314ed3b
+EBUILD mobile-broadband-provider-info-20190618.ebuild 469 BLAKE2B 0e6a8f13b86c8721465f08ba1e2b31351fbf7827b7d03318adb2cbb6c5d9f83fc227f7e79a978233e1619cb20ef9a3ebde49c3b0baaa7288737ccaa69fcf39c6 SHA512 2dc183364ce0e2f0aa1c9d5ee11d26c0454dcb81d532dc303f6cc26e21ae87cc8e6888797b4f0cdc007a5d53e7be014f2bfe8f3be4599e5e34fc0fa32589430b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
index d1cd048a18a9..978626b1c2b6 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 02e8f7c9175e..4e833c4a0f50 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.10.0.ebuild 3662 BLAKE2B 7616049f7b48b92f6c70f446a78317b3920d3e3b33670738fe81eb5e5c755e42cfb70cb2b12783d0e070daada9014c2be79fb80f3a532c90b6a101278e7d5feb SHA512 9ae0a71a24629a64aa53275a6bdcde1d70a13cc42ebe6193be09c87087af0cd2d5bcff6d1c4e420e4a838b342c2304431edd49338e56e7847acc2a304af7a13d
+EBUILD modemmanager-1.10.0.ebuild 3661 BLAKE2B 66e06b0af5ab714e215b00b3d41d627f360f039888603088ffefde7328f07f78f809833493212aded505cd444f5ca068fb3679487b95ee26bc8458c3900f0eff SHA512 2f20bffd177e61f100c64caeced18741bc0f57daa2dba33fb3787254f05dd11cbd08205e77c58c7195d0c9802c5147ce8632ef4ace98cf7c1b67b70ad256e9b6
 EBUILD modemmanager-1.8.2-r1.ebuild 3660 BLAKE2B 95ab23bf54720d3d15886437fe74c42c6b847d3b8310d84de4188dc901671855dba4be3ebd22ce94aec93bce215161a2267c69d9c4b3d26ea946844dedc679c0 SHA512 ef13e13c227cd257647f13cc6f15f8909602eaef328f9f5095e295ab9b69718511f44e7be1ad63b3a027d5caf3ba4464457a21ca7e96ebf451c1f0e34f82c50f
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
index 6a81cbe41c5c..bdd18cb193d3 100644
--- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index e82fe8ba1216..297252fb021d 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -3,6 +3,6 @@ AUX nemesis-1.4-fno-common.patch 4632 BLAKE2B 3a5352f58eaed5cd0120142c482551d15f
 AUX nemesis-1.4-libnet-1.0.patch 4627 BLAKE2B b2ab0e2c72bc24729912d60938dbd0f06ea7f93d78f0431baacab136b1a892ef8c5b0c1d6be96d03940b45aa8d058b05853db7f35832d7bbc53fc988fa019968 SHA512 aa94f7b9db756e636b671de2e0f56bcc145b73f808ef907d1f8965c78e8fd025a69e684d693a3095a751d6a3433c3f34c43c753624c0543c1c5b45bbb1c69eb9
 AUX nemesis-1.4-prototcp.patch 1287 BLAKE2B 0d50d3258f8a1c80cb9622c05ec8611e6f90491fc2d045c9a792630918f8bb73776555ce7714b6d5a2f0ee79b54d9d842db8f0ab3482b6d1fb18a92fe9fd257e SHA512 89f5bbd0506ff6ee15823631c254b9dc7049eccc31f9882485a6e07a9686f8d96f84ef7b56e366d1f3fccb302db9383b10ed3a17be3508a8ab4a001809e7876a
 DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9c598f9e57bda517f462448a0a74721425144ec00afb2cde5ba86fcb020d2d7dbf4d6df688b67f7c282d9d38 SHA512 a8d4b434a9b0287e704ab923900c43051dc3aac4a7063e702aa93d7c89cfdeac287a6f40138bdca140e2c889e024f885288c4953940104ac12631cf7394501c8
-EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B f9c7e0bfc12c5454ecb735171f698ddfe9aee49b95e55a2b4177489b382ce423c7c467bc867260cb45f026a9e3eb3333749a57b5e0d77c3afc3299d38eeae98e SHA512 f8a01c0e2b031ecb40d161aeecc83bd3931a21185ffdb3fe8c1cc83a0332f1f225405e65d0efb13de18276abea8be80b982f05d5ae7774fd6eb6e8a1029e25a2
+EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B 0b7f3379705788d1873f67005011e0e6c8f54fa2ca7e96f22524ffc1ad67545e4e286991fd829db4a72bdfb0f9d22dad5ebdf93ff7537ffbc138e80490f9856a SHA512 d54b880507e5cfdc71fcc735d404758ffb9f466f1a633f410431ac2555b515238d35f76774ebf311f9378cddecd2c4feed9b1d00b596d36c1d7dde8756e652fc
 EBUILD nemesis-1.4-r2.ebuild 666 BLAKE2B 14e7e14141dbfff3fc419d00beaf5728f992bbd423ea772298dccb1c4d7b4839d0e9ce309c94352191569e93a135387cd509a4ec61f2fa483e62c13292ad17e6 SHA512 395dbb43b21367dc634319c8ba94f3f9461bc8e3f31cee318366066d4ea0709f9bca74be5848dec0210530844ac724c9357df1c3a14550953f84cf750e620ddd
 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/nemesis-1.4-r1.ebuild b/net-misc/nemesis/nemesis-1.4-r1.ebuild
index 2728a521e68c..5df00db4a5b5 100644
--- a/net-misc/nemesis/nemesis-1.4-r1.ebuild
+++ b/net-misc/nemesis/nemesis-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/netkit-fingerd/Manifest b/net-misc/netkit-fingerd/Manifest
index f181887b77c3..e7a4dc2a0f8d 100644
--- a/net-misc/netkit-fingerd/Manifest
+++ b/net-misc/netkit-fingerd/Manifest
@@ -2,5 +2,5 @@ AUX fingerd.xinetd 250 BLAKE2B 0b9a1e2af0bcf4223ae8919245c1b9696693c07adc9c6aed2
 AUX netkit-fingerd-0.17-name-check.patch 681 BLAKE2B 89b120b47f3d3ad0599b28586e455a8c5a25f93d9afe81ab55e69e12474c9706e63845d86c6405e4e3a31b2b5205b132b7c7d371c5e7d9c5e7b68dfc15ce2446 SHA512 832afddbf7c5d9985fd5ffd87f3354be1c2aba4a82146e2ebfca81045c80b91238b31f94ef72409042e8fd8c250108d2d29feb3a1ce1acd77769d3df8a09c23a
 AUX netkit-fingerd-0.17-r2-gentoo.diff 603 BLAKE2B c17544baf5fb2cdec8172a4f9d833d575858b606e1dced6793ae4d7d6593d6ec416b7c35324c0dd39dad38a322d8cdbaa0135f79ee8bc2114a2bcaf30b7b4dc0 SHA512 1948a9c350a31497fa681aa6061ac859a5a3b18b9efb4b87a323a45a1472c6ddc31e50da33b891701f2e7196ea6fa07a40c31575ba261f9c2f3a6e28b35dbbb1
 DIST bsd-finger_0.17.orig.tar.gz 25521 BLAKE2B 4b8eb07d057d2ef2bfea5987820ad6aed7c73e2365fc78c7dcf76be0f74a3056ccf5115c3b58f3235384caaacda76dc38e4ce51713fa1c28c10160232213f348 SHA512 07570a9a5797579273938ef728f222f483c733e78eb6acb00e2bce9ff9df29aa85ed715872032701c8f67fcbc7cf5501f12dc2b8234c30df7d25f50cc38359b0
-EBUILD netkit-fingerd-0.17-r3.ebuild 1142 BLAKE2B 6d747c6875b7c0918c977985f1348c53dd3a8628b356e5afd5b29d547f27fe83fe5cb2616be90fbd05b9aeca88020f2fb6d099fe8fa7f2ef214c58c37016e3b5 SHA512 b8feedaaf853d77d3084aadbfefd70103ed1ba1307e8a43fd7f8f706ca8ca967744c364712a3669fe34836d800541c082518791e3539be7a1b54a2e417971f62
+EBUILD netkit-fingerd-0.17-r3.ebuild 1139 BLAKE2B 5db9d63732450e8366817d0e88df0089f39aea097415de2cef1169d0b2a8460e0e588c8f5fe546ab19b1407e2e05df0ac1ce90f5fa7aaee008c8bc6e57f72beb SHA512 067e21ef6837f259444306737d4fc381c06ed2a2e9b8e1f18ad7d437c288c24484e9c867f58322131b4cbefc19de42e6ab4df69fee2b79a9ddc16135da919b72
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
index ea34147a6778..05b6c4462dfd 100644
--- a/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
+++ b/net-misc/netkit-fingerd/netkit-fingerd-0.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-misc/netkit-routed/Manifest b/net-misc/netkit-routed/Manifest
index f5e4c6dff63b..4f5e4d3e4a53 100644
--- a/net-misc/netkit-routed/Manifest
+++ b/net-misc/netkit-routed/Manifest
@@ -3,5 +3,5 @@ AUX netkit-routed-0.17-time.patch 568 BLAKE2B 33d0462028efa3672d1d640ffa8da8532c
 AUX routed.confd 589 BLAKE2B b727efb8e8de5a4d47a68922f181e99d7fed05137aa9ab5f5908ac08ad3b96bc61ead94e7227aa3cbfdd23dbd4c29de0fca92834a18dca720384ce0ac2a33cd0 SHA512 ce7d67dbf1fd7c18bdd8154eaa4ae46ccdbf178224383a3209577cbe7292f4442b294af40e5e9e9b3d6c801982f719943a988cf19f26176a06cd7fc1444942f3
 AUX routed.initd 396 BLAKE2B c44a587481c6a24115472c0a8988c991c937e8f950c1fe1a48c320b0700751f9071e26cad7be4edda7a2f57816c2c0b77888ef5639f60289e2317227d70ab279 SHA512 62cb5ae462bb9baeeb383a1ab2afd3e24407403592ea613854bc8f48def576b7fb3d4c211f138b49b3c1d3cc818fb7c08be12fb2b5b973dcb9b669c9c01800ca
 DIST netkit-routed_0.17.orig.tar.gz 36435 BLAKE2B cfa0ab9fcbca1369e812e02dc76524e8668b340dc70c345b038f659fd9b48979fe1c27249748d5455d636ad2cef204fd646f2967761971de0b01aed88af80778 SHA512 9dea1048af22d5bbcec0aa9722a518e81d4415c7cc3219ae13d38450b0960fb30e0b082648717336c5870fa65f921a3830aadca23d0595ca719f89f4615afbc9
-EBUILD netkit-routed-0.17-r5.ebuild 1064 BLAKE2B 616e061058d20d3f673207fb892e97640e3dfb03dd9bc44def18f23e835d85afe4469c23bc810c448bab7ac8f5453f5d6c32c6f833bedd7a442cd144590acc23 SHA512 b8676fa6f89556baf8d5963e170733bac6a19bdb7fdfc7afcb5750009a00ea5586dfd529af86fa2f0640eb8bba4406a6f02f09e6bb2e7b1f90974b7d671bd099
+EBUILD netkit-routed-0.17-r5.ebuild 1061 BLAKE2B 55b16cec98f05df9bcae9d4d11290a3ecd3e76635dbc207e56418a30fed045552c8a3d759302dd26e9d76e9ef49bef81ea584dd2d950d68626016b73d0fdfb43 SHA512 1459f87906599a62d9a60db049e1a4288fcf0aa732f7116f8e7a9ccdcbfcf008b309fff430b5dc7352df5f275bc7b43881107cf8045c020dbc4ff1ff16b64c6a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild
index 88ba7b52b813..ffaa1e249d89 100644
--- a/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild
+++ b/net-misc/netkit-routed/netkit-routed-0.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index ef66890434a1..87bc4ec300df 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -7,5 +7,5 @@ AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f9388156
 DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
-EBUILD netkit-rsh-0.17-r10.ebuild 1759 BLAKE2B 28ccea74c7fad7e2c0c8220dd14c19eda28573a410b6fc4c8681700e104c6efb9a78ec5f78235c1728e1d2402c6f2a865196d6bd76fc102c377aecf3f01870f9 SHA512 64e642366aeb67c3bda272e513abca462c7362674b9c41bf4b2b45a17f7d97be8005e7107f28330d3d1e9179988c465bd91ad20381a3d64256f938e3a774f0a2
+EBUILD netkit-rsh-0.17-r10.ebuild 1759 BLAKE2B 12f49955c1763f9d5bccd2fe9aecf641e7dd55802647f0cdf46b0ded063860dd931cd5b57b227e89daafae5d774bc81939219bb846e723e748ebbb76ce3a6d00 SHA512 aab8bfb775964f37055f461b668d8cceeec9df6ca3d0fc80ee561ecc9435defab7726a36a86488ce108c298953c25bb11215cacb9a5f4ae257b27cb5f23ff0e8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index ed04d8e7e453..7202e33be2d8 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.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="4"
diff --git a/net-misc/netkit-talk/Manifest b/net-misc/netkit-talk/Manifest
index f57a7318a3bf..a23f405f0706 100644
--- a/net-misc/netkit-talk/Manifest
+++ b/net-misc/netkit-talk/Manifest
@@ -2,5 +2,5 @@ AUX netkit-talk-0.17-ipv6.diff 1587 BLAKE2B 82947b16ee0a8fbe3622de9109dd3dbb504d
 AUX netkit-talk-0.17-time.patch 385 BLAKE2B 5b49b4d562507c6b60911379e0623e17a2c5b25ec6ea1dc5f85c72e67823fac86b6152cde241e9823feb118c7e706b502031c583e216481cda7b5a47804ecbd1 SHA512 4da0417515e8e357cdc3b5b46b3edaa324dba767ae9dea6aa374ac8e4cf835dc0a4766684edc1e2b254840858721558a1e29940ea95ae274b06ded99fbf5499f
 AUX talk.xinetd 265 BLAKE2B 94381bf30fa51682b9dd272174cd8a3fed94233ff8ec654044419016a3adedbfac4e0db1f86c3851c9f7aa1c63d6e7411def635ecd3aa8cc88ec4d50656985c8 SHA512 f4f29a6e57aa80ffd6acc45b3c4a5bc5086fc6061f8d9bdfbe4fea4f874cedbdd5f85f60e311aa473e53119c16c42289161011699d24b944992aee0aec9ccb1f
 DIST netkit-ntalk-0.17.tar.gz 37396 BLAKE2B cdc7af27bb5f0b6b1139e3d8b33ecc3d4c661a76ee9de4cca8f5954251a30b5b3dc926ff906a7b51223b1c8590ff99a408ca07642c454bfd095b91fff482dffb SHA512 5a886c0f73179060f926d4af781a6b9d4de7b62562a69db7b93c4fd783ad12b488ee967af18e5a11f98e7f94d659c1688d2a3d4ba4a00bdec31869aa39a321c5
-EBUILD netkit-talk-0.17-r5.ebuild 1189 BLAKE2B f2dc7e6efcf11458c5d82a6a1cc91185c520fba9181b9d8ee93d8da3cb7992bef6b1265b86df2446cfc18f70407dbec33126799e6f5832a2533a92a13e6e6491 SHA512 e6556d5e95005b0ba35d05c11895f7795b149f7238e3af711d14d3854f6948a4f08e5b3af93f78f3f59757ff3c5fc49c1a0254649e657f60284036b1cde615f9
+EBUILD netkit-talk-0.17-r5.ebuild 1186 BLAKE2B 874313cefcb77f50c1c8756d887f02d67f5df14097bbe9ac16790124409ff43b4dd608476d000be12eeecd28301b6f1864ca86172a30edf5f9d02f83eefb7873 SHA512 09c5cde48424343d6652c92d0a72e793140ba8c482b1dd3c245b3835c843d526149f7d5bf2d9842fb00f1c88c01c86c180ccd93f9f2ff5935e081c0b71ed33b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
index 3d18bbe1ebcb..f0de376d0ffe 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 2c597747cc05..e825a8d3472b 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -4,6 +4,6 @@ AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d45
 DIST netkit-telnet-0.17.tar.gz 133749 BLAKE2B 0eef225adeb0dd332ffd9cce0285213e6aa89f04263fb37e3dac35462492732265b2c29bd2a86277e39e0ad55267ff1a150f1140823c91d44c29cf6a20df8e7e SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3
 DIST netkit-telnet_0.17-36.diff.gz 27226 BLAKE2B c19370f6462295bb7e8d09307121ec3356e9d1751b3ce5b7985844f54506351f633de381ffb3cd3209995c1826aaaa9ce716084742d4689d626b28aee8a3eb43 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a
 DIST netkit-telnet_0.17-41.debian.tar.xz 36592 BLAKE2B 6db35c25e14b219c15c4dd180f0dab064e5b101b42f29e7b71d99f797d22a51b376e6de148cf83fa479039f0ecbc811ecc36953dd89ae11f079b4ed42690d18f SHA512 4de0d51c6cc3c9113b38c9ab76553d22294a02a86d2e02a0481bdad77887782902d41f99eb5dd268bee175ebee5489b3e9871012234a7480a431ef47015cdf5c
-EBUILD netkit-telnetd-0.17-r10.ebuild 2482 BLAKE2B 54a4db7de27ebf9f34bd2c5269d8613e8fd7f899c1093f443ca18990805bf690c5bac86ea312aa004cfc24db61565232e257c390ab9e7a7554a01ba86af65ca8 SHA512 8f4b632df913711fc7597fdfe8e4da8f898363a8baa17d36004ed2c6e96f76a8e261ad0655938258470b158958cb66dc93eca3c2618e42bb1a776f33f33fbff3
+EBUILD netkit-telnetd-0.17-r10.ebuild 2479 BLAKE2B 83a574cc11e77c557021f9b81f0a2d06791241503aeac7b5abe5a4938dd2f24fc276cad2945c30e144f355d347ff58d857f6a5d61b2b452cb2523e6fb75b8bf3 SHA512 9f74811026e3c390606edfcbda7b2c5aef36bb131621aa919581ad768ee97302da974995e8b433464a7adf62b3dcffe3443a90dcec3d753427912406ece33181
 EBUILD netkit-telnetd-0.17-r12.ebuild 2510 BLAKE2B ab803c9689175733cc7daea94d042815c81834d1c62a4e0bc1655eda5b862334950d81515711d289d3e4da4b62a64292e9bf6c15f43510f00cb5ea4ed6062b3e SHA512 a9e8ee0c760810d365bab47f6278840076c52ebdcabe0d63175a2f3cc13fe0138bb7c926c1a034588737679ada21d09a9a28c9ab8316a18f5075f7e5b97a9c00
 MISC metadata.xml 598 BLAKE2B d8e784ee117674b8820d1dda844282c296535255872239741bd8fd731a27979ea6b4e2fa276ff16bae355934a34f87cc0fe1bfe99e1d4d36f824d806a22dd735 SHA512 0e67cc6f6f92fd784726eb82124652850e84be55006f00fd4b8071272219f7d9581d2f52c82df26a509a6dd1abcfe8ea7cb0c1eb442750a3700d637163335f83
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
index 280086598367..a543bc37a961 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3865e30e6cb6..ed38bc14311e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,5 +6,5 @@ AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11
 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
 EBUILD networkmanager-1.18.4-r1.ebuild 11313 BLAKE2B 64307633192d02edf3d4d623588cfe7ab009e2a668daee04c0261d2c9a5b40abe8e8fc840a546a626b2fd32d2ec6aca0bc92aff7480e34e0d79d3f750d817347 SHA512 1b8db6b06a3974cdc746312797a4adb736c389596cc54ef6ed27f23a0aaf2fce401f92e5a1fc4d6ec57bb056bb1c0fa4e3dd8f2460409ad21529c3412d901d7a
-EBUILD networkmanager-1.18.4-r3.ebuild 11453 BLAKE2B 60492af74aa341b60c290d89dfa52c7f7bf2a38cb353cfedc469ac9b3fd18d16fe6034b722ce4fa587482c9e10ad059d31854bc1688bc302f603da8f326661f0 SHA512 cbeacaa37268f40912e46c6cc676aa7b854ebe7d880f88db87e828cb51aca5268ac682e90416d65f94651ff57848519e3b0b802e99fdc5e97aa9a6667484ac6a
+EBUILD networkmanager-1.18.4-r3.ebuild 11452 BLAKE2B b403c667180b5ea673f148a5eb0557ac11c45b5cc3928306b5d4b9b544d3c806ae2ea050169ea58158ff3a75e511b08cc87582128efec7cac31856bef691ea5e SHA512 2ca15626a85fe5cace717fe776e6dc8e62e677b32a7fd5dde3d34d5d6bec81a641331cb7d001023d45de5f40229c1a41f7f4d12d132e339e50984d9db147ec2e
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
index 7f6098399a87..c090e7eb0aff 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index 78dd99ad78e1..b0b0a16b8603 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,4 +1,4 @@
 DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842
-EBUILD npapi-sdk-0.27.2.ebuild 398 BLAKE2B 0bc92c4e260a2590bb025100563f31706c6aff29eff425eeab900bc4001e832f6b51cd7cc3ad2e4ddebe197f43c73cbfb5370e7adce7bb912a3910df7ca91162 SHA512 e17bf341987ce0f00f60919428ed4636aa6762e07ecab0575da23a441367be12ec6133a4e517537089d3318b597650678567a5c7d7b2c9cbaf166a667decded5
+EBUILD npapi-sdk-0.27.2.ebuild 398 BLAKE2B 3c055e8fd6dd54dd77ab0240a0c5eb06b1e49978b6dcbfd0ada9df96965890912885e4e53066801d534e1621983d7d99819242c2b28ac6a0ec62ed2dfd40519e SHA512 3bb0e3420518c68716ee4914f620329de1c9a26701cd435494b47a0c4137e33b153dfe5f2922d7ff177267603354ca875edcf0b98b5372728db7ac36db00e6ff
 EBUILD npapi-sdk-9999.ebuild 387 BLAKE2B ab17a3761f4a41e182ef3016cf6b8b98e928c0717cf74540d34a1b8b39e56d7cadef8c7d71e397f3ccb88ab8e298451cb9ab81f8b7930530a736430e7024568a SHA512 fbef4e67de851b6027c8928c81d588239ea968fe6f20e0d74982956ee09ba15b08ea703a0e63c3d7eb9b3f0a9f317f5e52b3145fa41a9ce838c00001b49d55f3
 MISC metadata.xml 443 BLAKE2B 1e501dd78a1f3b7d9caea6c6d935b19d08d672fc054d50c22980df21ca536f32968a9a952aafbad1acedafc50256fe3d86db17ece531e3faa081a37cd451a5bb SHA512 2972f9d9367efdb7a37cbc28b9fcb5930b4898e367fe0d3538a0a328293aec9cd80163cfcdfb4fc42d2b676f763f88b7507c84a37212a08efa87b6a496d1287b
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
index 9a9b8543ceb4..259bdc824cf0 100644
--- a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
+++ b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index edf31fe9c60f..ca4eb3c84c8a 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
 EBUILD ntp-4.2.8_p13-r1.ebuild 4562 BLAKE2B 0c2ea0e5db7ed0beafd8f16c68148fcbcfffac71d842ced27ef4b605bc59411b3a4327aa449635e4cbc91a63b021018c8d1ccc98d39fab705b91c6e4996d2c5f SHA512 ffa1e54d5cb412cbd484cf911e44c50be9a3f649a4c78995344bf40095ad8fecab35c8efac2df6377d4522399f96f38f4d5a566d7eceacbb34e97f04d4b3995c
-EBUILD ntp-4.2.8_p13-r2.ebuild 4613 BLAKE2B d4ba16cbde46c383b9cc441b46b1187708615689508e9d11d2c1bfb42bf56617946d269e7591ae86b7b62855dd89b3084bd6aac37ed941553e7b8e4bb4f3455e SHA512 450e5178f50520310934eb59418c15eb1377957f521c5f9721a9b8d579f2933e8349b0dac1d1368b4b8b7b9b23edc996d6b4a1a959c5f806eda764f77f123dc5
-EBUILD ntp-4.2.8_p13.ebuild 4550 BLAKE2B be2ab12851068dd20baa6e134fecc34c4e5fd651b4235041672bfb5064bd15a20560b3fd17eab2add20f8f4685e4b55682dce4fb36ba833e91a9856daab301bb SHA512 8821c4c21a76c108de86b746057225618a7fd595cc90a3db77e3ce247f20705d618ca1f50ffa5e6e3fe087f6652f9e4befb559976beb32e2746ac873a30ba253
+EBUILD ntp-4.2.8_p13-r2.ebuild 4613 BLAKE2B d1071b3242fc3e2fd9726d875129088021e2d2e1a495a55439ab0b2c457a882a22da8b5b291cb0ec30d1f270465911a3795d167f8b7389308e0fce1cdeb29f0e SHA512 8bb87841e8390da267ff66f927cb18b3f76a04195becd2d22b6351ef808e3fce815c087f67282035b96082e6e21ec1155390baf699994f2dc8189186c520d94c
+EBUILD ntp-4.2.8_p13.ebuild 4550 BLAKE2B 4ab389fd4c778896b631ba7ddf472456c315dfb7787a09a38d22c5a09df4df2e510c905557cf9119df82852bbe9c78c57256902b3e0a2624090b3da36c7bf0fc SHA512 ab7e785e61aa60a253947ce73050e124bcb9fbb05a64d50115f7ffbbd4c8b4eb3283caca9d49b5a6e3ff2a4a69062966e689e30c2c6924d4d23bfe87f0a45103
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
index 508eb7ff7b9f..f08b75b54091 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.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
diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
index 7d06985ec9cd..a78a3be42762 100644
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 47b58ad0b39b..4a4a9b09c81c 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -9,9 +9,9 @@ DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67f
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 DIST ntpsec-1.1.8.tar.gz 2589363 BLAKE2B e7e11a7d980599ac598f084608160d3f6f6cf8e2aab5fb45cc15cabca30462bd03db7b9ecc140826c5d7b5e26f49b48f7f2b6043bdc2ffa1d73167347fb8123f SHA512 0920f25adf68f1b8ccd1734c5d61ba1c858cd86b342db7b5155dd9b58e538aa96aad3fd4058597f079ec3df63cb51d2900ac8e6d9c84d6f2bd4a3a22cc0c967c
-EBUILD ntpsec-1.1.4.ebuild 4129 BLAKE2B df2ff391b6f084c8c19d6ef64e7a1f2b161b935fed7959e3b9f5581c11b2f9c95fb9ab5eb6030171a05156f219ffdbb5b0d25f867067f8c19acafb2dd32a0e4a SHA512 1053d16b3ef63b90526837ba4147190c83672ae9928b70665a3f3ebbaeeb4bc642ed87df42ba53ba20c1f8da84b75fd47cfe8bffcdc559af7a10a382efd1a024
-EBUILD ntpsec-1.1.6.ebuild 4087 BLAKE2B ef856f1e3bed036f0ca07f2c70d72f4cceec53510689c578f9b4a4e27799ea41c834daca0c5f10cb2eddc0e74beacad33690e2b21853a4383c08601398753215 SHA512 09b86ab6a59aa19d5eb90a2ef864edb96ea5b47d143625b697bbf0a20135f8445675fea28b652b5e0b4670c64c014c2c171537656250a681113f3c4140081fa6
-EBUILD ntpsec-1.1.7-r1.ebuild 4180 BLAKE2B b5b4d46fbd3e5880b5278bf4385320c60b65e79dcfd4624169618cafe37e421dd5ff0f0dc246460cab0f4dc3c9c62d2a254df23d7cab9b4ca463b6448d6c78f7 SHA512 e59e9764694811e9e7b63021ebdafdc38e4a1d372653d926c352f2e56e15589475a2340ddd96db5248501db8d09a51d605719f9361ef5bbfbe762c4267c335c3
-EBUILD ntpsec-1.1.8.ebuild 4109 BLAKE2B 0c2f48f7d481378a47931659312ab6005855325e1c3c909c7538c2442d0f0e160136a07f4260ca27868e797243eb39d1fbd6a4e1364c261e1c00b9501143376a SHA512 c02087784096401c19771004d4b3dfe560d0b848aef7b44c6b228bf23c85d740bd909babc849f0e75fbb914f040d9550f6da1fb5ff26c3882cc902790038cf71
-EBUILD ntpsec-9999.ebuild 4109 BLAKE2B 0c2f48f7d481378a47931659312ab6005855325e1c3c909c7538c2442d0f0e160136a07f4260ca27868e797243eb39d1fbd6a4e1364c261e1c00b9501143376a SHA512 c02087784096401c19771004d4b3dfe560d0b848aef7b44c6b228bf23c85d740bd909babc849f0e75fbb914f040d9550f6da1fb5ff26c3882cc902790038cf71
+EBUILD ntpsec-1.1.4.ebuild 4119 BLAKE2B 944627f2d6cd0f9c0a83d6258d857a63d66832115ca3ebbbf72d3d4bb9f4d2857df26cde6650d4d8a8f1eb2d0a04d0b2e0188640729b991e2e5059a8283e6bdb SHA512 2ef78287947e9c6a59d17be67bd15049f14f266beb8733295de0f532ac30c6e39088a5888ca0029443582201d9f3ccb44cf2e52202f84547ef8c52cf3063f6e7
+EBUILD ntpsec-1.1.6.ebuild 4077 BLAKE2B 24f82c887bdd8d2f5cdac4580d5803629cac818b91168d0bf205562419c399f664b4fc1264c6f88ef8d0fd167f66f4cb6fc343a1220032ec65729e9ca721dd11 SHA512 082e35dc0322737d9077deb8cb240d011d0d74d90b612e8a4d60c5d08f672c4c2f195f15ba8bd8c9dca01e67e769b1d1941534bb12242b7808123d539837eae4
+EBUILD ntpsec-1.1.7-r1.ebuild 4170 BLAKE2B 830f468ccc34883d9606155d68a46e0ad5182414de78b0a6754edac475bc19b383be80c1ca79b2b0ade771ff66fe52e4643f5cb3f3243dd2d02e6c7865648676 SHA512 eb7e62f61a523a1af060957ba74d7bd8e7705230aa0597570e478191c18d586d8bd92b89e3a5f9d59de77e5f456a05e0ceb32a37012e9a3c1d803358d731ab8c
+EBUILD ntpsec-1.1.8.ebuild 4099 BLAKE2B e7d09ff800876d66809ebd6ca10be4b2efe3acd439b37574e6502834b32b39ba6c44ae9f591f18718904c528cfd808eebc7fe2bae89eb08bca2ac9006a25bcc7 SHA512 356d43ef08bbc079b95518074e50770302d3bdb29d2d26c26149993d8db3d8b977eb539e0e576162fe75fad60bb26d40bb56a5cb43005a307e2ebae3b7689f15
+EBUILD ntpsec-9999.ebuild 4099 BLAKE2B e7d09ff800876d66809ebd6ca10be4b2efe3acd439b37574e6502834b32b39ba6c44ae9f591f18718904c528cfd808eebc7fe2bae89eb08bca2ac9006a25bcc7 SHA512 356d43ef08bbc079b95518074e50770302d3bdb29d2d26c26149993d8db3d8b977eb539e0e576162fe75fad60bb26d40bb56a5cb43005a307e2ebae3b7689f15
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
index 89b9f6d4b4cf..213ae93609a5 100644
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index 8862e1be4568..67b24ffac50b 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
index ec96cc7d8316..b9f7fcb422b8 100644
--- a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd
diff --git a/net-misc/ntpsec/ntpsec-1.1.8.ebuild b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
index 32a1121feb40..1316806dc69d 100644
--- a/net-misc/ntpsec/ntpsec-1.1.8.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 32a1121feb40..1316806dc69d 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index b0d360c2904d..5ccf6a21618b 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 647 BLAKE2B ff4154127273b5b95700634d5b4f717e880e071dc53b7caa4674b8e8df665c5ef1cfe1506df815e4725a05bb0d466b08f6d7524d89407d5bd036bebf9bdd2bae SHA512 3d8990e3eb7f329fdeb582bef83aa5b7dcf2b7054a9c77d9dc521ac7fa6896e9364d9bbb9e43faefa8d9d9375b36ba6f20342c3a916d540cb8489c9861e6cab8
-EBUILD nyx-2.1.0.ebuild 655 BLAKE2B c0101655d8866d5e42e30d37695f1472ae9a3f0f594a817998df46bf394a3b5c117f8a9aac4b85184b972c1756a4f0d1be1bc9f3ecc8201e226350616f87641e SHA512 5da53efea0752d17ae915365b3d0c48bed34974ad99af20c0d13a663ede87986b28146b2fe6d1e97419b7dbd56a6ca5b8980c8180138fec13ae9202474a9a34c
+EBUILD nyx-2.0.4.ebuild 641 BLAKE2B fb3c515f583cbf55a513c54630f13218516a73bf4515ccb2f9e7a9a2ffdf0813eaa75e00f7a4c61de54eb3bd9e5e0be9687763325a0016d33f1926f8ee89b543 SHA512 449650b92a90e03b8a22b8b112788ac953ce2f40903045cc3bbaf1b9041961ae03999629675453a5a3d80e3de437e6e973f6726a75349e9be2e5351bc4a48b36
+EBUILD nyx-2.1.0.ebuild 651 BLAKE2B 5490cf50b4883e1c91f8f879e30a65645eb78c0675c67583c1d741cfc94a02965ae7cf910a85e8dda2817865c004ddce1a2e32644eaeb58308eca974be0f240f SHA512 923ab719cdf7b597c48d472bf3ea28a4d4856a709fc7fb5f870cdb05ae8694c7b1a65ee2a2d4a5d8160a09ba1ad354594b230c9f01347a83f1684eaf3e35c932
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.0.4.ebuild b/net-misc/nyx/nyx-2.0.4.ebuild
index 4252b76c9b41..cd27d40170bc 100644
--- a/net-misc/nyx/nyx-2.0.4.ebuild
+++ b/net-misc/nyx/nyx-2.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0.ebuild
index 7371cc1a2886..99d81268a583 100644
--- a/net-misc/nyx/nyx-2.1.0.ebuild
+++ b/net-misc/nyx/nyx-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index f048953aa265..d8b6ecec0cbe 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -13,6 +13,6 @@ AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c
 AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
 DIST oidentd-2.4.0.tar.xz 188280 BLAKE2B e7a6cdcc78ae61b103b81335d6a4802bbc301adad256dbe9461245e7a2839e1f4786cf3bf7206df2f8fc6414351c4bb8f92c87d16d69f678e0793b9a760ee966 SHA512 3dc6f8ba1c374c21bbc721516f83c5b825d5bc75dbda390d5e5e0e72ceac31495380a6025c626edcec4f8685a009f5be9571606c50e28fc28dc9f73a20f1b2d0
-EBUILD oidentd-2.0.8-r6.ebuild 1442 BLAKE2B b199c11c4aea797741036f2defdb694c9125e29c6eeca82c754b6934c6a53a8fb76625e75215fc94eb709e71c3a55364863fc2e2ab35f7ac01ff4abb66219a48 SHA512 1f9a211bdfd473e94f41f7665e425ac8bf0d01b692c7ff9213a5408c19747c09938f6cbde41131402602823f2682992a6ab256ad3248406075b625db739bf4f6
-EBUILD oidentd-2.4.0.ebuild 1190 BLAKE2B 81c3af9c1d4adc68f61d1c2000cba415d3111f6688c08ab539d0e0bb0b5cab49fe44ae57e9248762bf57c68552fad0ee2a73cecaaef476f54b5c8733ba8271df SHA512 c912deeb8409409d176186ddb52c3d12b994de512a76b8a8e5fa3eb11188f92ce08aa87f228ab1fef19b9f8bd37ca4cdceecc7e9ade2b737d09aad1eec258168
+EBUILD oidentd-2.0.8-r6.ebuild 1442 BLAKE2B 57dde60a50d3320a552cd307238497cd585e6cc19fccf2efccde819d0d0420e1c6a0f617dc7e8498941ba6e96f7f2bde3e598924c7d216695edbac12f647fb75 SHA512 facbf9a25e0ccdcc402190183b1a1bfb79b4c797e66733d5cde3b57c19db69b1f43a20733ca8cbe3613815725e88be02ef9acc880222388396de086915260852
+EBUILD oidentd-2.4.0.ebuild 1189 BLAKE2B b5a532907a2fe31f6e7d8d9f351d3206cde48c5fd25ac585f73c226abf77e8faae4a3279842afe67ebc82b57119408d5ad5d0d0dbc54b73fc213588f539b8c0a SHA512 cb764653e10fa23491f0472182958d7814ad8e67d16c29082b90c776adaa570fdb52801b4cc3173215527a2a036167a38cad5d370458f2d43dc5fb566b90ac7d
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index 54e946f454ff..aa6c386da6e5 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/oidentd/oidentd-2.4.0.ebuild b/net-misc/oidentd/oidentd-2.4.0.ebuild
index 0e6c8b86cf54..3b85fa13389e 100644
--- a/net-misc/oidentd/oidentd-2.4.0.ebuild
+++ b/net-misc/oidentd/oidentd-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="debug ipv6 masquerade selinux"
 
 DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index e5c2dc39b064..435503595ea2 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -3,7 +3,7 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0
 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 2967 BLAKE2B d19fd5f82764e12ef6ffe1ea8b691285f9aa49ca62cebf3f5b1ff0144f0d00da0fbaa5154f768cb6d7244d52b24dcc011a9b1b41a3bf421dd290585f2508d343 SHA512 a8a079fecd794ffd4b12fd162d9dc673a0394b783effca78cbb5a3263328ab4e55aa618079cedfbd8d682b076bdbc2f3de0eb6bc7ec5da3c5101d27af857fb1c
+EBUILD openntpd-6.0_p1.ebuild 2967 BLAKE2B 5fe3b04828dbbc6467c3edf549a5d62ebdfc7aa1db7a4a5c57902efba5162b05a216c0d803b0eba356ec9d9225cfdfa778af275ea6f21a72c277caa1c225ef70 SHA512 dee32de36230a92a3040a8890cee68b60128c27cf6185a517806f484411ce4afd41b27759ec2194ac0829b30df5805b588a92cd657f73829fe4e9f9569ee921a
 EBUILD openntpd-6.2_p3-r1.ebuild 1828 BLAKE2B 7813a2d7d4812115e70298d31672496804a96a3209174cc1008489402e7af8d6ad2352d2e7ba7cbdd0ef45d1c5811134e1503dd50e95bca672a4fa5954c5cc0e SHA512 89b35ea882953ca5ac63859ab30c8daebe48349aacd1bbd486be67ebb2bcccbd8e7f8c468f0def8f46a5b42f38d1d49bd3f6676688bbcf86afa9a610eb62cbfe
 EBUILD openntpd-6.2_p3.ebuild 3142 BLAKE2B fd27664a830055da657731df5b3e36d6643d7b8d31d2b2c89885597bb26b7055dd00c57d1f3a629bfe1a57475fe913774c44c8d492f513779b104ab9be01b9ce SHA512 d1d25b88d27a4e7a59cf71929fc3a8245ef46ee28f5d2ac87281c9979406c64b4c2522ecb03333fdca0055a0d5a0c4e9db84e2329c4ac93c12cd7104abd16980
 MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild
index 4ea9ce807e0d..8b2c9daf99e0 100644
--- a/net-misc/openntpd/openntpd-6.0_p1.ebuild
+++ b/net-misc/openntpd/openntpd-6.0_p1.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=5
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 4a24ad791c6d..a3a7ef91fedd 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -37,6 +37,12 @@ AUX openssh-8.1_p1-hpn-14.20-glue.patch 3534 BLAKE2B 13206d78b0e344d4d90aad3f9aa
 AUX openssh-8.1_p1-hpn-14.20-sctp-glue.patch 737 BLAKE2B b8f93cb197206eb4315c66350ce3e943cd5f1280b5294099320cbc4a611de2a23f5a5c04ed71a394e1bd23a0928df50d754f549d652e53389ceadda2ac9f1636 SHA512 96fa9a317d9cc0a77bf5a8d82d8fa0498fff04309bc4ae546b34939580c4ed945d075f26d8ea16e787d7bf631ea5067543f380ab08167993d713ec1591a346b9
 AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac67196ad11a316163db0cf6d4c75d73db1cbae038707ec788c5101f40ebf455257fa2cd1b9d7facab1081b5b856317543dd7 SHA512 2cf4e5da60e30932619c6915295b1659f53db3e784e87fcbbd25b8d167df8e29a1712235413bb2d485956494111aa682d086f9b5a36c3f55a286d40599df8b8c
 AUX openssh-8.1_p1-tests-2020.patch 1332 BLAKE2B a400f6859a5d096729c9cb6047dce8612da7fe5f8d06cc891cfb6a4c88b568be3dfc7872d5be78ef349798f501828e1505bbd5ebd49d548dbbdc6bbf987dc843 SHA512 8f4c535d3ab15e4c761f6f5d4efe762ec2bc9b5de49ee369ce9186fe40095d2065418249c89161a8ef53e893079264fd9c95b73cd74937b08fa9f563a4f00290
+AUX openssh-8.2_p1-GSSAPI-dns.patch 11647 BLAKE2B b904922f809a6616f488509a962c778837bc6003138efe79fb1ce9edf9611f14c209c11559a922497c50c3dff450286e40dfcb929414cb7f705357d2c4e3603d SHA512 f9256a80c75ae0db11df0e562ace026614f2f6d0f6c91eaed7786b2a3c37608e18ca45242385813fa34487e50f21e5d3a13bfb66adc854b7c34d278a164c3dc4
+AUX openssh-8.2_p1-X509-12.4-tests.patch 405 BLAKE2B cfdd9b557d69b9230dd24fce00504f96ec3349712b1ca8667bb60fc9619d7fbfe44d2de847fc8b06c31de434fcab6e53ec4cd373a20a701372fdb0516ca14839 SHA512 788f6e1a522773bb322d70be6edd32734034c35073eea417d3895ecd176b3cc3ebd228285441ec12e75c991121e40eaa6b75b8be76a05167a0419773ae13018a
+AUX openssh-8.2_p1-X509-glue-12.4.patch 5824 BLAKE2B 2476520076f9e7ca6c0ff53ee9efa3121f3c229d429eda243aa4a9b17e7492b5748c95414ea46b789fac0453ca272ba54d440f2ccf2baf9af08891469b18af19 SHA512 fed53756e81113d1f155dcf26ecf3beb2a4ccedf06511520ae0ad8978d1dfd144fb5412458d50726dd292980e3e201b6462786d0fd12be9ebec57c7b012b4b6c
+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-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
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -68,13 +74,17 @@ DIST openssh-8.1_p1-glibc-2.31-patches.tar.xz 1752 BLAKE2B ccab53069c0058be7ba78
 DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192
 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566
 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925
+DIST openssh-8.2p1+x509-12.4.diff.gz 802630 BLAKE2B 1d4c30aa6fb2b90c3213a04adef8fc99b28796e72b067d308d5947a6f697ca2abead2a4658356e01347efaf9eb5100aeb054b56b04d55dd716d3793fad69010e SHA512 0314496ed7466efb90f18143b70d676fbb7990fd9ec6685992f36a031b47c638597ed3773ec3c121d416cbbf8ba2d3d2e8cb9c703bfc77a82ba5aa5c3bdde0de
+DIST openssh-8.2p1-sctp-1.2.patch.xz 7668 BLAKE2B 717487cffd235a5dfa2d9d3f2c1983f410d400b0d23f71a9b74406ac3d2f448d76381a3b7a3244942bff4e6bdc3bc78d148b9949c78dc297d99c7330179f8176 SHA512 a5fbd827e62e91b762062a29c7bc3bf569a202bdc8c91da7d77566ff8bb958b5b9fb6f8d45df586e0d7ac07a83de6e82996e9c5cdd6b3bf43336c420d3099305
+DIST openssh-8.2p1.tar.gz 1701197 BLAKE2B 8b95cdebc87e8d14f655ed13c12b91b122adf47161071aa81d0763f81b12fe4bc3d409c260783d995307d4e4ed2d16080fd74b15e4dc6dcc5648d7e66720c3ed SHA512 c4db64e52a3a4c410de9de49f9cb104dd493b10250af3599b92457dd986277b3fd99a6f51cec94892fd1be5bd0369c5757262ea7805f0de464b245c3d34c120a
 DIST openssh-8_1_P1-hpn-AES-CTR-14.20.diff 29935 BLAKE2B 79101c43601e41306c957481c0680a63357d93bededdf12a32229d50acd9c1f46a386cbb91282e9e7d7bb26a9f276f5a675fd2de7662b7cbd073322b172d3bca SHA512 94f011b7e654630e968a378375aa54fa1fde087b4426d0f2225813262e6667a1073814d6a83e9005f97b371c536e462e614bfe726b092ffed8229791592ca221
 DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1877acdedeaee80172da469b5a62d0aaa43d6ed46c578e7893577b9d563835d89ca2044867fc561ad3f562bf504c025cf4c78421cf3d24397e9 SHA512 768db7cca8839df4441afcb08457d13d32625b31859da527c3d7f1a92d17a4ec81d6987db00879c394bbe59589e57b10bfd98899a167ffed65ab367b1fd08739
 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
-EBUILD openssh-7.5_p1-r4.ebuild 11165 BLAKE2B a2ec84eee8d85fcde9f1f31dd1093aacbe24fe121ee234067aa196a9e1a9399cf397396cadbc6cbd2e5b004e505ac76a67dfacf8820b4c61fc74af7932b961b3 SHA512 1023740690ecab734bc7671b65a68defccff626b9da0ef0580c45fb6d30de681d05b555bb0d74cb342aa3873f11d2ac5c6a444041f13c80b508412a7b4fcac4c
-EBUILD openssh-7.7_p1-r9.ebuild 15908 BLAKE2B 82c5c2e5ff3f9ee0f1a99b1b3c455b41180da4d8cfde805cd0f8b12f833d6eb0ca60344362e8861e4b70a59951c78f345e5480b19cb8886eb50aae2a686b06d0 SHA512 80115988d12fed4b4b58affc264fd4fb0bd493893369779b54dd30a7790820be3fee51816d6bbd761c69c6258de3ea2e60aa2307c3245c42aef76737116d6fd2
-EBUILD openssh-7.9_p1-r4.ebuild 16280 BLAKE2B f92dcd2d77e2f9545a06adcc2760eed840b0309df447a656e4b83482c34b4c380f60b8950a5dff305a1ffdb1dd2625afe856a0a9da3b728102eef81bf0aced85 SHA512 ca07f21accaf519b290e5d2208110c95d04153f64ceeda2988cab9cb8ffe3c4493c1eb347a00df69820c222f64e5dbed137aadb8cca8a2f60fb47442ccc2c771
-EBUILD openssh-8.0_p1-r4.ebuild 16663 BLAKE2B 0c2b6048a4c936c473f68b63cf0d7a5b6fa9d65f48ea5bea42ebbed06980236399e674111da0dfeb122449da5b5bc08ba9e6355fac5701ff34a31ee574ba3ace SHA512 1f32100d6a67cec24096f4445b16912ea3dbcbcc2010590e3ef62af12670bc8743d271b6b0d0332eab680654c4271ce2e866649dbb879853745a517250e820fd
-EBUILD openssh-8.1_p1-r2.ebuild 16413 BLAKE2B a74b650af4d74c6256c5f47c2cce9bdcc69cbdf5fc0068444bff72f6147152e1fc17ef9e552a1795f9bae95919db824af4551d33d0797c8e3c438c9e92fd9d52 SHA512 2c3a625733d290fa1c874334ea1930111105e7ecb878671a2d79fe91a4cb84d7192c2a742c2ec27d38f5c488eef12d04cc133dba9ba588d19bacb34ea95961e2
-MISC metadata.xml 2291 BLAKE2B 9e12fbae3c37a48c3b04876a7247bf38c33d6cc5be210b382e35e45c9318b3c3e7c91a0ef32a9fda96ac7a68a00f9d703aacfc1c1f23e59511ea97d159527488 SHA512 8605c7aa2e4594a04006b3abfac3fad359e3e44182be53116e25159b7419d4429176617c10b50354d0d10c2be26af550e9a2b6e4c7085906558a569dddf5c8f3
+EBUILD openssh-7.5_p1-r4.ebuild 11181 BLAKE2B 05ab7ab14082824bc936d189cd72087e795d02b98ab73a1161ebd5ead95c9f466763f7a13aeb151edf99fc18d89d2fe4cd04ed1d514c97bf0139376e3eaad53b SHA512 7f94963a12667c41ce2a73d17ce8528fefe60a04b7c3a33daf76fb8066a1d9fcc3632925cdf338846e35234e6412dfb3d64485d810e18575ca3db1303de79d91
+EBUILD openssh-7.7_p1-r9.ebuild 15924 BLAKE2B b4c978f231feeadbd3ed5bde9424bc4ad0533ca6ac0cafe1a33417dbd1d04182e92444f4553c1762a0aa97c45cc20dc2f869638a788b1a2df9e89cfdfeba9f8d SHA512 6104ca756ad931f08b27e9f3b3ed6519ee5f89e30ece3607a4cee81081c9d15d7c39776dd3629671cc44074d79a96e923f5d08c8dc5920f77be03c174567d6c6
+EBUILD openssh-7.9_p1-r4.ebuild 16296 BLAKE2B 836063b7f82a97e473f042ef2f2fe87521f4c72f9a4d4289205f5530bce5cb7e14ac5fac889634f82cc01a6e5bf5b9907aad57ff5040a2b5587682f44580d092 SHA512 41c100d9918aac6fae825aee354329dc8eaf63361c3125636369441eed98e1e96831f5e7dc623958d56d62ec09e5f2f74c9f93da6af9e00f220c36b7cd3f2e49
+EBUILD openssh-8.0_p1-r4.ebuild 16679 BLAKE2B cc2c63682376443a11036e10182b7bef0c61bbb0a33fb3bf8e806a79d13f1bf9208f7c47519ddc35a95b3025b91026144e60480c92954eefff62791281d6c006 SHA512 674208389a7b7b28495a5145a948f1083a25b7697b6620677b3035111e8b73d9fcfeb091b516026c0edcd6dd4c37b939a1dc21738b372029acb68e0bbcdfaa5a
+EBUILD openssh-8.1_p1-r2.ebuild 16429 BLAKE2B 3ddc0fa26dab49ef9b08dd0de5bf8257b3fd5918af145a9806b65317fba8e431d69177dcad5d4aec4965d5f6f5463e1239edffdce182c560fee36a36e9248089 SHA512 6dfda0e0c7bdc87025878ecd0ad967221888a5d0466aad9458f127c55d2dee5efa4330b0cd6f409e50f7ab77054f405a2d67d05519997b42bb79fb791c920fe9
+EBUILD openssh-8.2_p1-r1.ebuild 16764 BLAKE2B 621f9920b17281cdd137649e6a005e3cfad2a03fd312ea0db751a883880be83a10261b70ee428efdad6d5e50c5bbda197a7bc5a38d15321025b7948ae447d51d SHA512 5cd26fa5164a659936f4ebca9570317f4a4421bc7e27ade5a0db3baf993cee60a3537c5ed8a1d08eee3d09beaaca210c86ef118032a1718d8323a4cefbee9916
+MISC metadata.xml 2361 BLAKE2B 695d283e9b32826edf5d86ed1a26f3182d09ddf5ec40a35ac8273cf99ba042f4b6aeec563946e8c2b2ab5de798258c95810c8b23b9b725d1633b8ea7b0a105e7 SHA512 a532edee5daadb1390a02c124cf4dd0c80b956676bfe833bb5ffccc1cdc0d2aa9c5f9d10f61cb24af74aa7b731c2cc2f4b4418d94a2a75cc8f0c57ea98d57707
diff --git a/net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch
new file mode 100644
index 000000000000..d4db77b98557
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.2_p1-GSSAPI-dns.patch
@@ -0,0 +1,359 @@
+diff --git a/auth.c b/auth.c
+index 086b8ebb..a267353c 100644
+--- a/auth.c
++++ b/auth.c
+@@ -724,120 +724,6 @@ fakepw(void)
+ 	return (&fake);
+ }
+ 
+-/*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-	struct sockaddr_storage from;
+-	socklen_t fromlen;
+-	struct addrinfo hints, *ai, *aitop;
+-	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-	const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-	/* Get IP address of client. */
+-	fromlen = sizeof(from);
+-	memset(&from, 0, sizeof(from));
+-	if (getpeername(ssh_packet_get_connection_in(ssh),
+-	    (struct sockaddr *)&from, &fromlen) == -1) {
+-		debug("getpeername failed: %.100s", strerror(errno));
+-		return xstrdup(ntop);
+-	}
+-
+-	ipv64_normalise_mapped(&from, &fromlen);
+-	if (from.ss_family == AF_INET6)
+-		fromlen = sizeof(struct sockaddr_in6);
+-
+-	debug3("Trying to reverse map address %.100s.", ntop);
+-	/* Map the IP address to a host name. */
+-	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-	    NULL, 0, NI_NAMEREQD) != 0) {
+-		/* Host name not found.  Use ip address. */
+-		return xstrdup(ntop);
+-	}
+-
+-	/*
+-	 * if reverse lookup result looks like a numeric hostname,
+-	 * someone is trying to trick us by PTR record like following:
+-	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+-	hints.ai_flags = AI_NUMERICHOST;
+-	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-		    name, ntop);
+-		freeaddrinfo(ai);
+-		return xstrdup(ntop);
+-	}
+-
+-	/* Names are stored in lowercase. */
+-	lowercase(name);
+-
+-	/*
+-	 * Map it back to an IP address and check that the given
+-	 * address actually is an address of this host.  This is
+-	 * necessary because anyone with access to a name server can
+-	 * define arbitrary names for an IP address. Mapping from
+-	 * name to IP address can be trusted better (but can still be
+-	 * fooled if the intruder has access to the name server of
+-	 * the domain).
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_family = from.ss_family;
+-	hints.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-		logit("reverse mapping checking getaddrinfo for %.700s "
+-		    "[%s] failed.", name, ntop);
+-		return xstrdup(ntop);
+-	}
+-	/* Look for the address from the list of addresses. */
+-	for (ai = aitop; ai; ai = ai->ai_next) {
+-		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-		    (strcmp(ntop, ntop2) == 0))
+-				break;
+-	}
+-	freeaddrinfo(aitop);
+-	/* If we reached the end of the list, the address was not there. */
+-	if (ai == NULL) {
+-		/* Address not found for the host name. */
+-		logit("Address %.100s maps to %.600s, but this does not "
+-		    "map back to the address.", ntop, name);
+-		return xstrdup(ntop);
+-	}
+-	return xstrdup(name);
+-}
+-
+-/*
+- * Return the canonical name of the host in the other side of the current
+- * connection.  The host name is cached, so it is efficient to call this
+- * several times.
+- */
+-
+-const char *
+-auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
+-{
+-	static char *dnsname;
+-
+-	if (!use_dns)
+-		return ssh_remote_ipaddr(ssh);
+-	else if (dnsname != NULL)
+-		return dnsname;
+-	else {
+-		dnsname = remote_hostname(ssh);
+-		return dnsname;
+-	}
+-}
+-
+ /*
+  * Runs command in a subprocess with a minimal environment.
+  * Returns pid on success, 0 on failure.
+diff --git a/canohost.c b/canohost.c
+index abea9c6e..4f4524d2 100644
+--- a/canohost.c
++++ b/canohost.c
+@@ -202,3 +202,117 @@ get_local_port(int sock)
+ {
+ 	return get_sock_port(sock, 1);
+ }
++
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++static char *
++remote_hostname(struct ssh *ssh)
++{
++	struct sockaddr_storage from;
++	socklen_t fromlen;
++	struct addrinfo hints, *ai, *aitop;
++	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++	const char *ntop = ssh_remote_ipaddr(ssh);
++
++	/* Get IP address of client. */
++	fromlen = sizeof(from);
++	memset(&from, 0, sizeof(from));
++	if (getpeername(ssh_packet_get_connection_in(ssh),
++	    (struct sockaddr *)&from, &fromlen) < 0) {
++		debug("getpeername failed: %.100s", strerror(errno));
++		return strdup(ntop);
++	}
++
++	ipv64_normalise_mapped(&from, &fromlen);
++	if (from.ss_family == AF_INET6)
++		fromlen = sizeof(struct sockaddr_in6);
++
++	debug3("Trying to reverse map address %.100s.", ntop);
++	/* Map the IP address to a host name. */
++	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++	    NULL, 0, NI_NAMEREQD) != 0) {
++		/* Host name not found.  Use ip address. */
++		return strdup(ntop);
++	}
++
++	/*
++	 * if reverse lookup result looks like a numeric hostname,
++	 * someone is trying to trick us by PTR record like following:
++	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
++	hints.ai_flags = AI_NUMERICHOST;
++	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++		    name, ntop);
++		freeaddrinfo(ai);
++		return strdup(ntop);
++	}
++
++	/* Names are stored in lowercase. */
++	lowercase(name);
++
++	/*
++	 * Map it back to an IP address and check that the given
++	 * address actually is an address of this host.  This is
++	 * necessary because anyone with access to a name server can
++	 * define arbitrary names for an IP address. Mapping from
++	 * name to IP address can be trusted better (but can still be
++	 * fooled if the intruder has access to the name server of
++	 * the domain).
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = from.ss_family;
++	hints.ai_socktype = SOCK_STREAM;
++	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++		logit("reverse mapping checking getaddrinfo for %.700s "
++		    "[%s] failed.", name, ntop);
++		return strdup(ntop);
++	}
++	/* Look for the address from the list of addresses. */
++	for (ai = aitop; ai; ai = ai->ai_next) {
++		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++		    (strcmp(ntop, ntop2) == 0))
++				break;
++	}
++	freeaddrinfo(aitop);
++	/* If we reached the end of the list, the address was not there. */
++	if (ai == NULL) {
++		/* Address not found for the host name. */
++		logit("Address %.100s maps to %.600s, but this does not "
++		    "map back to the address.", ntop, name);
++		return strdup(ntop);
++	}
++	return strdup(name);
++}
++
++/*
++ * Return the canonical name of the host in the other side of the current
++ * connection.  The host name is cached, so it is efficient to call this
++ * several times.
++ */
++
++const char *
++auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
++{
++	static char *dnsname;
++
++	if (!use_dns)
++		return ssh_remote_ipaddr(ssh);
++	else if (dnsname != NULL)
++		return dnsname;
++	else {
++		dnsname = remote_hostname(ssh);
++		return dnsname;
++	}
++}
+diff --git a/readconf.c b/readconf.c
+index f3cac6b3..adfd7a4e 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -160,6 +160,7 @@ typedef enum {
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
+ 	oHashKnownHosts,
+@@ -205,9 +206,11 @@ static struct {
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
+ # else
+ 	{ "gssapiauthentication", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
+ #endif
+ #ifdef ENABLE_PKCS11
+ 	{ "pkcs11provider", oPKCS11Provider },
+@@ -1033,6 +1036,10 @@ parse_time:
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+ 
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1912,6 +1919,7 @@ initialize_options(Options * options)
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -2061,6 +2069,8 @@ fill_default_options(Options * options)
+ 		options->gss_authentication = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+diff --git a/readconf.h b/readconf.h
+index feedb3d2..c7139c1b 100644
+--- a/readconf.h
++++ b/readconf.h
+@@ -42,6 +42,7 @@ typedef struct {
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+diff --git a/ssh_config.5 b/ssh_config.5
+index 06a32d31..6871ff36 100644
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -770,6 +770,16 @@ The default is
+ Forward (delegate) credentials to the server.
+ The default is
+ .Cm no .
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPITrustDns
++Set to
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+diff --git a/sshconnect2.c b/sshconnect2.c
+index af00fb30..652463c5 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -716,6 +716,13 @@ userauth_gssapi(struct ssh *ssh)
+ 	OM_uint32 min;
+ 	int r, ok = 0;
+ 	gss_OID mech = NULL;
++	const char *gss_host;
++
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
++		gss_host = auth_get_canonical_hostname(ssh, 1);
++	} else
++		gss_host = authctxt->host;
+ 
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+@@ -730,7 +737,7 @@ userauth_gssapi(struct ssh *ssh)
+ 		    elements[authctxt->mech_tried];
+ 		/* My DER encoding requires length<128 */
+ 		if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
+-		    mech, authctxt->host)) {
++		    mech, gss_host)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			authctxt->mech_tried++;
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch
new file mode 100644
index 000000000000..1c58d0d5d823
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.2_p1-X509-12.4-tests.patch
@@ -0,0 +1,11 @@
+--- a/openbsd-compat/regress/Makefile.in	2020-02-15 10:59:01.210601434 -0700
++++ b/openbsd-compat/regress/Makefile.in	2020-02-15 10:59:18.753485852 -0700
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
+ EXEEXT=@EXEEXT@
+ LIBCOMPAT=../libopenbsd-compat.a
+ LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch
new file mode 100644
index 000000000000..6c9d80de9bc2
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.2_p1-X509-glue-12.4.patch
@@ -0,0 +1,150 @@
+diff -ur --exclude '*.un~' a/openssh-8.2p1+x509-12.4.diff b/openssh-8.2p1+x509-12.4.diff
+--- a/openssh-8.2p1+x509-12.4.diff	2020-02-15 10:50:06.441041447 -0800
++++ b/openssh-8.2p1+x509-12.4.diff	2020-02-15 10:52:52.241790237 -0800
+@@ -39197,16 +39197,15 @@
+  
+  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+-@@ -378,6 +379,8 @@
++@@ -378,6 +379,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+-@@ -386,11 +389,14 @@
++@@ -386,11 +388,14 @@
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keygen$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keygen$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-keyscan$(EXEEXT) $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
+@@ -39225,7 +39224,7 @@
+  	$(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
+  	$(INSTALL) -m 644 scp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
+  	$(INSTALL) -m 644 ssh-add.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
+-@@ -400,12 +406,12 @@
++@@ -400,12 +405,12 @@
+  	$(INSTALL) -m 644 moduli.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/moduli.5
+  	$(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5
+  	$(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5
+@@ -39239,7 +39238,7 @@
+  
+  install-sysconf:
+  	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+-@@ -463,10 +469,9 @@
++@@ -463,10 +468,9 @@
+  	-rm -f $(DESTDIR)$(bindir)/ssh-keyscan$(EXEEXT)
+  	-rm -f $(DESTDIR)$(bindir)/sftp$(EXEEXT)
+  	-rm -f $(DESTDIR)$(sbindir)/sshd$(EXEEXT)
+@@ -39253,7 +39252,7 @@
+  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1
+  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1
+  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1
+-@@ -478,7 +483,6 @@
++@@ -478,7 +482,6 @@
+  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8
+  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8
+  	-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
+@@ -39261,7 +39260,7 @@
+  
+  regress-prep:
+  	$(MKDIR_P) `pwd`/regress/unittests/test_helper
+-@@ -491,11 +495,11 @@
++@@ -491,11 +494,11 @@
+  	$(MKDIR_P) `pwd`/regress/unittests/match
+  	$(MKDIR_P) `pwd`/regress/unittests/utf8
+  	$(MKDIR_P) `pwd`/regress/misc/kexfuzz
+@@ -39275,7 +39274,7 @@
+  
+  regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS)
+  	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \
+-@@ -546,8 +550,7 @@
++@@ -546,8 +549,7 @@
+  	regress/unittests/sshkey/tests.o \
+  	regress/unittests/sshkey/common.o \
+  	regress/unittests/sshkey/test_file.o \
+@@ -39285,7 +39284,7 @@
+  
+  regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
+      regress/unittests/test_helper/libtest_helper.a libssh.a
+-@@ -576,8 +579,7 @@
++@@ -576,8 +578,7 @@
+  
+  UNITTESTS_TEST_KEX_OBJS=\
+  	regress/unittests/kex/tests.o \
+@@ -39295,7 +39294,7 @@
+  
+  regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
+      regress/unittests/test_helper/libtest_helper.a libssh.a
+-@@ -587,8 +589,7 @@
++@@ -587,8 +588,7 @@
+  
+  UNITTESTS_TEST_HOSTKEYS_OBJS=\
+  	regress/unittests/hostkeys/tests.o \
+@@ -39305,7 +39304,7 @@
+  
+  regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
+      ${UNITTESTS_TEST_HOSTKEYS_OBJS} \
+-@@ -618,35 +619,18 @@
++@@ -618,35 +618,18 @@
+  	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+  
+  MISC_KEX_FUZZ_OBJS=\
+@@ -39343,7 +39342,7 @@
+  	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
+  	regress/unittests/sshkey/test_sshkey$(EXEEXT) \
+  	regress/unittests/bitmap/test_bitmap$(EXEEXT) \
+-@@ -657,36 +641,29 @@
++@@ -657,36 +640,29 @@
+  	regress/unittests/utf8/test_utf8$(EXEEXT) \
+  	regress/misc/kexfuzz/kexfuzz$(EXEEXT)
+  
+@@ -39400,7 +39399,7 @@
+  	TEST_SSH_IPV6="@TEST_SSH_IPV6@" ; \
+  	TEST_SSH_UTF8="@TEST_SSH_UTF8@" ; \
+  	TEST_SSH_ECC="@TEST_SSH_ECC@" ; \
+-@@ -708,8 +685,6 @@
++@@ -708,8 +684,6 @@
+  		TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \
+  		TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
+  		TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
+@@ -39409,7 +39408,7 @@
+  		TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
+  		TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
+  		TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
+-@@ -717,17 +692,35 @@
++@@ -717,17 +691,35 @@
+  		TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
+  		TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \
+  		TEST_SSH_ECC="$${TEST_SSH_ECC}" \
+@@ -39448,7 +39447,7 @@
+  
+  survey: survey.sh ssh
+  	@$(SHELL) ./survey.sh > survey
+-@@ -743,4 +736,8 @@
++@@ -743,4 +735,8 @@
+  		sh buildpkg.sh; \
+  	fi
+  
+@@ -97723,19 +97722,6 @@
+ +	return mbtowc(NULL, s, n);
+ +}
+ +#endif
+-diff -ruN openssh-8.2p1/version.h openssh-8.2p1+x509-12.4/version.h
+---- openssh-8.2p1/version.h	2020-02-14 02:40:54.000000000 +0200
+-+++ openssh-8.2p1+x509-12.4/version.h	2020-02-15 09:07:00.000000000 +0200
+-@@ -1,6 +1,5 @@
+--/* $OpenBSD: version.h,v 1.86 2020/02/14 00:39:20 djm Exp $ */
+-+/* $OpenBSD: version.h,v 1.85 2019/10/09 00:04:57 djm Exp $ */
+- 
+--#define SSH_VERSION	"OpenSSH_8.2"
+-+#define SSH_VERSION	"OpenSSH_8.1"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.2p1/version.m4 openssh-8.2p1+x509-12.4/version.m4
+ --- openssh-8.2p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.2p1+x509-12.4/version.m4	2020-02-15 09:07:00.000000000 +0200
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-X509-glue.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-X509-glue.patch
new file mode 100644
index 000000000000..5af4534ce77c
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-X509-glue.patch
@@ -0,0 +1,133 @@
+diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
+--- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 13:41:56.143193830 -0800
++++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 13:46:40.060133610 -0800
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -42,7 +42,7 @@ CC=@CC@
+- CFLAGS_NOPIE=@CFLAGS_NOPIE@
+- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+- PICFLAG=@PICFLAG@
++ LD=@LD@
++ CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA)
++ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -803,8 +803,8 @@
+  ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out)
+  {
+  	struct session_state *state;
+--	const struct sshcipher *none = cipher_by_name("none");
+-+	struct sshcipher *none = cipher_by_name("none");
++-	const struct sshcipher *none = cipher_none();
+++	struct sshcipher *none = cipher_none();
+  	int r;
+  
+  	if (none == NULL) {
+@@ -902,14 +902,14 @@
+  
+  /*
+ @@ -2118,6 +2125,8 @@ fill_default_options(Options * options)
+- 		options->canonicalize_hostname = SSH_CANONICALISE_NO;
+- 	if (options->fingerprint_hash == -1)
+  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
++ 	if (options->update_hostkeys == -1)
++ 		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+- #ifdef ENABLE_SK_INTERNAL
+  	if (options->sk_provider == NULL)
+- 		options->sk_provider = xstrdup("internal");
++ 		options->sk_provider = xstrdup("$SSH_SK_PROVIDER");
++  
+ diff --git a/readconf.h b/readconf.h
+ index 8e36bf32..c803eca7 100644
+ --- a/readconf.h
+@@ -948,9 +948,9 @@
+  	/* Portable-specific options */
+  	sUsePAM,
+ +	sDisableMTAES,
+- 	/* Standard Options */
+- 	sPort, sHostKeyFile, sLoginGraceTime,
+- 	sPermitRootLogin, sLogFacility, sLogLevel,
++ 	/* X.509 Standard Options */
++ 	sHostbasedAlgorithms,
++ 	sPubkeyAlgorithms,
+ @@ -643,6 +647,7 @@ static struct {
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
+Only in b: openssh-8_1_P1-hpn-AES-CTR-14.20.diff.orig
+diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
+--- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 13:41:56.144193830 -0800
++++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 13:45:36.665147504 -0800
+@@ -382,7 +382,7 @@
+ @@ -884,6 +884,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -391,8 +391,8 @@
+  	debug2("local %s KEXINIT proposal", kex->server ? "server" : "client");
+  	if ((r = kex_buf2prop(kex->my, NULL, &my)) != 0)
+ @@ -954,6 +958,14 @@ kex_choose_conf(struct ssh *ssh)
+- 			peer[ncomp] = NULL;
+- 			goto out;
++ 			else
++ 				fatal("Pre-authentication none cipher requests are not allowed.");
+  		}
+ +		debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name);
+ +		if (strcmp(newkeys->enc.name, "none") == 0) {
+@@ -1169,15 +1169,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b3fadf8..ec1d2e27 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,6 @@
+- #define SSH_VERSION	"OpenSSH_8.1"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v20"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+-+ 
+diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-PeakTput-14.20.diff b/openssh-8_1_P1-hpn-PeakTput-14.20.diff
+--- a/openssh-8_1_P1-hpn-PeakTput-14.20.diff	2020-02-15 13:41:43.834196317 -0800
++++ b/openssh-8_1_P1-hpn-PeakTput-14.20.diff	2020-02-15 13:45:36.665147504 -0800
+@@ -12,9 +12,9 @@
+  static long stalled;		/* how long we have been stalled */
+  static int bytes_per_second;	/* current speed in bytes per second */
+ @@ -127,6 +129,7 @@ refresh_progress_meter(int force_update)
++ 	off_t bytes_left;
+  	int cur_speed;
+- 	int hours, minutes, seconds;
+- 	int file_len;
++ 	int len;
+ +	off_t delta_pos;
+  
+  	if ((!force_update && !alarm_fired && !win_resized) || !can_output())
+@@ -33,12 +33,12 @@
+ @@ -166,7 +173,7 @@ refresh_progress_meter(int force_update)
+  
+  	/* filename */
+- 	buf[0] = '\0';
+--	file_len = win_size - 36;
+-+	file_len = win_size - 45;
+- 	if (file_len > 0) {
+- 		buf[0] = '\r';
+- 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s",
++ 	if (win_size > 36) {
++-		int file_len = win_size - 36;
+++		int file_len = win_size - 45;
++ 		snmprintf(buf+1, sizeof(buf)-1, &file_len, "%-*s ",
++ 		    file_len, file);
++ 	}
+ @@ -191,6 +198,15 @@ refresh_progress_meter(int force_update)
+  	    (off_t)bytes_per_second);
+  	strlcat(buf, "/s ", win_size);
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-glue.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-glue.patch
new file mode 100644
index 000000000000..b2163fe5ad56
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-glue.patch
@@ -0,0 +1,151 @@
+diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff
+--- a/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 12:50:44.413776914 -0800
++++ b/openssh-8_1_P1-hpn-AES-CTR-14.20.diff	2020-02-15 12:53:06.190742744 -0800
+@@ -3,9 +3,9 @@
+ --- a/Makefile.in
+ +++ b/Makefile.in
+ @@ -42,7 +42,7 @@ CC=@CC@
+- LD=@LD@
+- CFLAGS=@CFLAGS@
++ CFLAGS_NOPIE=@CFLAGS_NOPIE@
+  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
++ PICFLAG=@PICFLAG@
+ -LIBS=@LIBS@
+ +LIBS=@LIBS@ -lpthread
+  K5LIBS=@K5LIBS@
+@@ -902,14 +902,14 @@
+  
+  /*
+ @@ -2118,6 +2125,8 @@ fill_default_options(Options * options)
++ 		options->canonicalize_hostname = SSH_CANONICALISE_NO;
++ 	if (options->fingerprint_hash == -1)
+  		options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
+- 	if (options->update_hostkeys == -1)
+- 		options->update_hostkeys = 0;
+ +	if (options->disable_multithreaded == -1)
+ +		options->disable_multithreaded = 0;
+- 
+- 	/* Expand KEX name lists */
+- 	all_cipher = cipher_alg_list(',', 0);
++ #ifdef ENABLE_SK_INTERNAL
++ 	if (options->sk_provider == NULL)
++ 		options->sk_provider = xstrdup("internal");
+ diff --git a/readconf.h b/readconf.h
+ index 8e36bf32..c803eca7 100644
+ --- a/readconf.h
+@@ -952,9 +952,9 @@
+  	sPort, sHostKeyFile, sLoginGraceTime,
+  	sPermitRootLogin, sLogFacility, sLogLevel,
+ @@ -643,6 +647,7 @@ static struct {
+- 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
+  	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },
+  	{ "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL },
++ 	{ "include", sInclude, SSHCFG_ALL },
+ +	{ "disableMTAES", sDisableMTAES, SSHCFG_ALL },
+  	{ "ipqos", sIPQoS, SSHCFG_ALL },
+  	{ "authorizedkeyscommand", sAuthorizedKeysCommand, SSHCFG_ALL },
+diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
+--- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:50:44.413776914 -0800
++++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:51:19.541768656 -0800
+@@ -409,18 +409,10 @@
+ index 817da43b..b2bcf78f 100644
+ --- a/packet.c
+ +++ b/packet.c
+-@@ -925,6 +925,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -925,6 +925,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -434,20 +426,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -951,6 +969,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/packet.h b/packet.h
+ index 8ccfd2e0..1ad9bc06 100644
+ --- a/packet.h
+@@ -476,9 +454,9 @@
+  /* Format of the configuration file:
+  
+ @@ -167,6 +168,8 @@ typedef enum {
+- 	oHashKnownHosts,
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
++ 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -615,9 +593,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -112,7 +116,10 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -700,9 +678,9 @@
+ +			options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT;
+ +	}
+ +
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+  	if (options->ip_qos_interactive == -1)
+- 		options->ip_qos_interactive = IPTOS_DSCP_AF21;
+- 	if (options->ip_qos_bulk == -1)
+ @@ -486,6 +532,8 @@ typedef enum {
+  	sPasswordAuthentication, sKbdInteractiveAuthentication,
+  	sListenAddress, sAddressFamily,
+@@ -1079,11 +1057,11 @@
+  	xxx_host = host;
+  	xxx_hostaddr = hostaddr;
+  
+-@@ -422,6 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
++@@ -422,7 +433,28 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
+  
+  	if (!authctxt.success)
+  		fatal("Authentication failed.");
+-+
++ 
+ +	/*
+ +	 * If the user wants to use the none cipher, do it post authentication
+ +	 * and only if the right conditions are met -- both of the NONE commands
+@@ -1105,9 +1083,9 @@
+ +		}
+ +	}
+ +
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+- 
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
++ 		/* if we are using aes-ctr there can be issues in either a fork or sandbox
+ diff --git a/sshd.c b/sshd.c
+ index 11571c01..23a06022 100644
+ --- a/sshd.c
diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-sctp-glue.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-sctp-glue.patch
new file mode 100644
index 000000000000..2397aad96f2a
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-sctp-glue.patch
@@ -0,0 +1,19 @@
+diff -ur '--exclude=*.un~' a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff
+--- a/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:10:00.321998279 -0800
++++ b/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff	2020-02-15 12:10:21.759980508 -0800
+@@ -1169,15 +1169,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index 6b3fadf8..ec1d2e27 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,6 @@
+- #define SSH_VERSION	"OpenSSH_8.1"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v20"
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+-+ 
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index 7613265c18a1..6cc1ea784228 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -29,6 +29,7 @@ ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and
     <flag name="ldap">Add support for storing SSH public keys in LDAP</flag>
     <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
     <flag name="livecd">Enable root password logins for live-cd environment.</flag>
+    <flag name="security-key">Include builtin U2F/FIDO support</flag>
     <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag>
     <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
     <flag name="X509">Adds support for X.509 certificate authentication</flag>
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index 184b30bcbdd7..1614b7a9c148 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils user flag-o-matic multilib autotools pam systemd
+inherit eutils user flag-o-matic multilib autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index 98bf001c684e..675ab6bdd43e 100644
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit user flag-o-matic multilib autotools pam systemd
+inherit user flag-o-matic multilib autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 828c4a17b8ef..0a3da9ab28e2 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit user flag-o-matic multilib autotools pam systemd
+inherit user flag-o-matic multilib autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
index 1b1d9363437b..5153ebc19847 100644
--- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit user-info eapi7-ver flag-o-matic multilib autotools pam systemd
+inherit user-info eapi7-ver flag-o-matic multilib autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
index 057f482b572b..7b622cca1583 100644
--- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit user-info flag-o-matic multilib autotools pam systemd
+inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-8.2_p1-r1.ebuild b/net-misc/openssh/openssh-8.2_p1-r1.ebuild
new file mode 100644
index 000000000000..23a61c4f6d01
--- /dev/null
+++ b/net-misc/openssh/openssh-8.2_p1-r1.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user-info flag-o-matic multilib autotools pam systemd toolchain-funcs
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+HPN_PV="8.1_P1"
+
+HPN_VER="14.20"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="12.4" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+"
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp !security-key ssl )
+	test? ( ssl )
+"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	security-key? ( dev-libs/libfido2:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers
+"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )
+"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf
+"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" &>/dev/null || die
+		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+		popd &>/dev/null || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}" || die
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
+		if use X509; then
+		#	einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
+		#	# X509 and AES-CTR-MT don't get along, let's just drop it
+		#	rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die
+			eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-X509-glue.patch
+		fi
+		use sctp && eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-sctp-glue.patch
+		popd &>/dev/null || die
+
+		eapply "${hpn_patchdir}"
+
+		use X509 || eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with security-key security-key-builtin)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	# stackprotect is broken on musl x86 and ppc
+	use elibc_musl && ( use x86 || use ppc ) && myconf+=( --without-stackprotect )
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "5.8_p1"; then
+			elog "Starting with openssh-5.8p1, the server will default to a newer key"
+			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+		fi
+		if ver_test "${old_ver}" -lt "7.0_p1"; then
+			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+			elog "Make sure to update any configs that you might have.  Note that xinetd might"
+			elog "be an alternative for you as it supports USE=tcpd."
+		fi
+		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
+			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+			elog "adding to your sshd_config or ~/.ssh/config files:"
+			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+			elog "You should however generate new keys using rsa or ed25519."
+
+			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+			elog "out of the box.  If you need this, please update your sshd_config explicitly."
+		fi
+		if ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
index 82fad9124755..beea554fe763 100644
--- a/net-misc/pimpd/Manifest
+++ b/net-misc/pimpd/Manifest
@@ -1,3 +1,3 @@
 DIST pimpd_0.8.tar.gz 6763 BLAKE2B 4a9119a0f96b208551a61cc9c3e0ff2e278d7483e57baa0968f9e0949f23d824f75270c3fbc463f9af3e4760ae99e8f8b52fcedf5a2c3d86040486396acb819e SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe
-EBUILD pimpd-0.8.ebuild 505 BLAKE2B 0c17f0039381e14fc41fc36dd541175d8f99c39e770786782a10ac4e22d4952ef7c7cbf108eb38881ec02bfe002d83a08a162af950d940c0edcb43a846d5d2bc SHA512 2fdf23584c74ead7b41a72d570985a4651104a28d08a5d109434ea86a46820d39750407bb32eec19d2ea83eac08c0fb96d08673dff2c6b9eac528e3d049fde52
+EBUILD pimpd-0.8.ebuild 502 BLAKE2B 2dc0b588b80c1b16483ea1500dee2bf79bc5ac6cffa612c006362102743d35e89ec580471900ceda5d71c0574c26a9d7a6d4566f57f678892eff27ac4e5c3186 SHA512 d1161161cc4f2223aead8397de6064bebd37eb820585ebdd90dd3845249fa0862aeada927e83064eac2e1620ff3d5f4ebf83a3ebce635195e4d723fca71d513b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
index 86940f2db44f..62183ccfef28 100644
--- a/net-misc/pimpd/pimpd-0.8.ebuild
+++ b/net-misc/pimpd/pimpd-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
diff --git a/net-misc/pps-tools/Manifest b/net-misc/pps-tools/Manifest
index 41d7fd385f62..c0a4d68f897a 100644
--- a/net-misc/pps-tools/Manifest
+++ b/net-misc/pps-tools/Manifest
@@ -7,7 +7,7 @@ AUX pps-tools-1.0.2-build.patch 1217 BLAKE2B 68e2b0992cd782b66571b38ef5cd449892a
 DIST pps-tools-1.0.1.tar.gz 12695 BLAKE2B 8c05f037b03efc2685bf303f521e168e6c56c203665482fa456278e3580fba8d2fc04935b7f32b70b6ac50c28d4f998a2808f5e3034dcffad4ff1589fd8f2907 SHA512 6fe7eba2a1a073a64d40bcc7aef12981414b43656f05fbd84e3ffadf1a074c5aa8d032b39a37095e6846194558b685092b51799fe724fe50cce8f3cbe163f784
 DIST pps-tools-1.0.2.tar.gz 12701 BLAKE2B bc60a9ea94bb57bcc2b7870da433ef04fbbc30e5c4d880b719a8e7fcabba0bef2996c086e6993b879f2515cd0c685659bfed5371904401e35120ae1e9dc0891a SHA512 fa86455ece83700d5a1c522082f78ed324927fb9f53d3cf5f615a566a39e54938a41e82b6d4ae23d57c273fb923f96db4ca2d071199795d020952703afa53fcb
 DIST pps-tools-git-0.0.20120407.tar.gz 13619 BLAKE2B 9be7aacbcdb1c5ac2e53c66f97ba6c41f30c67b7d229f4f9797260d9b880a921e679e1c6cf847051fab0746cb2d9da0f4450411f4e992e42b0b5314bf6acf7cd SHA512 d2014262b0594959f337c25df859591d0737994decec663389392d3c7e53376ded2485713f6364c4833d8d7c40b4b0c3b88865ab85e481bcc2e81e35931d84de
-EBUILD pps-tools-0.0.20120407.ebuild 670 BLAKE2B bb0a12b01ff71e8ae42ead1aedc81a1ce526ab02be0103f5c16d945afdba34db4beeeec4a5e041848173dd0580e87d3af3b1445a1ba6a4add4b1e533cea5932c SHA512 1142dbd0bb7b3a69cb98110153737c85cc3cf8d0c2b65a9aebea24c47d02304d0eef19b2e92a7008c4d70c834a1da27dda121eaafd5f3945b6b9acfc91792df0
+EBUILD pps-tools-0.0.20120407.ebuild 683 BLAKE2B 86c7a81d4a0d372967245aa0695f39d9c0e873d1532f305b8debaca5f55377b21f202e32fb8829409452882adde35cb1169184a0508ec504d5e9943e92058be7 SHA512 6ded78dfbb7ea4ff2221b0cf4d8833aa3b71d2bcce158d7467fc130402f0445c974da85f71bd3ba9f8311477a39c7e896fb2a0ed8514d9819070fb691471e473
 EBUILD pps-tools-1.0.1.ebuild 592 BLAKE2B 54d5837caacda5372d5d8cc325d07f0902f54a146d866bae1b465402888124598fd344b5f93c312063d68db78deef34e3f310e7e7ef694770a70f374be6c9a23 SHA512 e31a33d7b608d05bfa547237db7dc8dceec909ebbd8d3daa0cb85da5c43306ca530ce67650d3e167828d2ea5228c48073643be8a2239ad83ad160f7d4db98e4a
 EBUILD pps-tools-1.0.2.ebuild 546 BLAKE2B 2ec9fcf152f44414fd77be561266608cee51d1af08471b5bf2271199d2d747ea8441d2b42e86ea40db40ff0c6b9297686f8d9c03ddf7670865bedf32807836fd SHA512 f08f8363ac12f14b6e7cb25cc9285a4940a7c0fda147d48cd2ec11fa46d61559af0b5a198471f0209d8074fa7cc92bd32f90c12769516dcf27eb06b2ad1dfcca
 MISC metadata.xml 350 BLAKE2B 830a67ed8c6d022a971aa92ffbfa853a0254dcad97f7275c301edd8ce71e356835356a166e209e5f1b3807a5432da293307c034452217665dbe6b705ab677fb2 SHA512 deb94805f239e5877578d64f42d5a8c88ab5dc172e7be282c8b4e03ac3f2aaf31a3210555bf5865976f701926b95d8e82d6e4e69e37c300fc96c253288f8da06
diff --git a/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild b/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
index d14563ac2ee0..a6f1989f839c 100644
--- a/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
+++ b/net-misc/pps-tools/pps-tools-0.0.20120407.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 GITHUB_USER="ago"
 PV_COMMIT='0deb9c7e135e9380a6d09e9d2e938a146bb698c8'
diff --git a/net-misc/proxytunnel/Manifest b/net-misc/proxytunnel/Manifest
index b9b60c9684e7..507b94d72bd3 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,6 +1,7 @@
+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.9.1.tar.gz 48025 BLAKE2B 5a844d8fdbb9a1eae9c40c7621086b873ae89813b7c596da4416efcb777a8110ad7d224a0efa2e193cfbbb82dbfe69d44d4dd36db080b8e902630a464a85b953 SHA512 819dd11bc13fc279d2d475b89909c0eea414ff71d772d4bfed742dd8d425669dc502f2c22d983bb8c58e426a2bc7209526cb21492ca5f8e92ea1b9ea961fcfdc
 EBUILD proxytunnel-1.9.1-r1.ebuild 1048 BLAKE2B 3e094ffb84e324cb426afb819cdf6ab0be3ce187fa792079a7b19b6df96e70ea2004d19d28e87b70fccb2cfb7f34c16d63cbcad6bbb778f52bc9f75f98445d55 SHA512 795116f573c2692ce2776b7cb4ccd6e3c19a88650750bdd2f87d5b5e8bdcf65efb08ed75dbbb93046ad85d4d80fc6072b4c721d80bca81ce0d3493206b9837d0
-EBUILD proxytunnel-1.9.1-r2.ebuild 1144 BLAKE2B 235a78aecce1da4cb61be6cb8955994c4d20d1ba3c28855d88b0c53c1547d39c92e67a506f940a8bfe4ebf02f1b673c9f33c28b58cbc506455df636a79f8e450 SHA512 cc5dcbcdbef3b73219c3b95ebe173965398e537e9bfbe2bf8e20d7415888b8ac40fb69f6bcfaeec00d50a3a7b2b317e1be71ca199b374496a818a71a2d7b7c09
+EBUILD proxytunnel-1.9.1-r2.ebuild 1177 BLAKE2B 6fc1c7d33d2acd73828338bfa1ae44a89162988db8214c9371316d53f92c217454627cabf31191489330b5d4104d2c59247ab0931f3709e26660c4f6dd8da399 SHA512 9a3e1517dd97ad8a702e9d184bf1f4bb2d0a0a023760b52b0011f1a94929c142e87935e4ff6974ad8db0837c1fec33bf302ed206b1b13515e444e629741ba290
 EBUILD proxytunnel-9999.ebuild 1096 BLAKE2B 5bb10d54b3fb48b972d5e9907a4a8bb69a6c9619668c5b8e55e74db108020bd8eff1f3acf8e1bdfc58153952751a4071652a3168e0062f6ad253589cabf2da8d SHA512 265cac79e95bfaa8f639114a03b4f79f73f83450328259dd3ddfddf63b575a35536009bfd4ae39c1716b973644a8bd78aa28b3a229c74edb47bdc3ff10eaa215
 MISC metadata.xml 717 BLAKE2B da3b819d7e0caeee376359837cf0a6294eee0363ad857369816fbf595e6add90666feeea356a9864d71a3987f7393ac7483bd4fe800bae67364291da420a2c39 SHA512 ecf80d876bccd3c2c98cb6a46e543e6adbe5a52a1666b6678cd86def313593d5200189f67cec5d85150e7a308139089786c416ee0a2d6bfe58d800b0fc7a18da
diff --git a/net-misc/proxytunnel/files/proxytunnel-1.9.1-gcc-10.patch b/net-misc/proxytunnel/files/proxytunnel-1.9.1-gcc-10.patch
new file mode 100644
index 000000000000..a42b8424cca5
--- /dev/null
+++ b/net-misc/proxytunnel/files/proxytunnel-1.9.1-gcc-10.patch
@@ -0,0 +1,128 @@
+https://github.com/proxytunnel/proxytunnel/pull/43
+
+From 517650724dc478dd35ac7c7953b4eb700ccb7273 Mon Sep 17 00:00:00 2001
+From: Paul Howarth <paul@city-fan.org>
+Date: Wed, 22 Jan 2020 21:44:01 +0000
+Subject: [PATCH] Fix global variable declarations/definitions for GCC 10
+ compatibility
+
+This boils down to declaring global variables as "extern" in header files
+and defining them in just one place.
+
+See https://www.gnu.org/software/gcc/gcc-10/porting_to.html
+---
+ Makefile      |  1 +
+ globals.c     | 41 +++++++++++++++++++++++++++++++++++++++++
+ ntlm.h        |  4 ++--
+ proxytunnel.h | 16 ++++++++--------
+ 4 files changed, 52 insertions(+), 10 deletions(-)
+ create mode 100644 globals.c
+
+diff --git a/Makefile b/Makefile
+index 57328e8..ecdaa5f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -63,6 +63,7 @@ OBJ = proxytunnel.o	\
+ 	readpassphrase.o	\
+ 	messages.o	\
+ 	cmdline.o	\
++	globals.o	\
+ 	ntlm.o		\
+ 	ptstream.o
+ 
+diff --git a/globals.c b/globals.c
+new file mode 100644
+index 0000000..fe19db4
+--- /dev/null
++++ b/globals.c
+@@ -0,0 +1,41 @@
++/* Proxytunnel - (C) 2001-2008 Jos Visser / Mark Janssen    */
++/* Contact:                  josv@osp.nl / maniac@maniac.nl */
++
++/*
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * 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, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
++/* globals.c */
++
++#include "proxytunnel.h"
++
++/* Globals */
++char *program_name;             /* Guess what? */
++int i_am_daemon;                /* Also... */
++
++PTSTREAM *stunnel;	/* stream representing the socket from us to proxy */
++PTSTREAM *std;		/* stream representing stdin/stdout */
++
++/*
++ * All the command line options
++ */
++struct gengetopt_args_info args_info;
++
++char buf[SIZE];         /* Data transfer buffer */
++
++char ntlm_type1_buf[160];
++char ntlm_type3_buf[4096];
++
++// vim:noexpandtab:ts=4
+diff --git a/ntlm.h b/ntlm.h
+index f919368..01a6434 100644
+--- a/ntlm.h
++++ b/ntlm.h
+@@ -26,8 +26,8 @@ void build_ntlm2_response();
+ 
+ extern int ntlm_challenge;
+ 
+-char ntlm_type1_buf[160];
+-char ntlm_type3_buf[4096];
++extern char ntlm_type1_buf[160];
++extern char ntlm_type3_buf[4096];
+ 
+ 
+ // Below are the flag definitions.
+diff --git a/proxytunnel.h b/proxytunnel.h
+index 593cd7e..aa09a4b 100644
+--- a/proxytunnel.h
++++ b/proxytunnel.h
+@@ -46,21 +46,21 @@ char * readpassphrase(const char *, char *, size_t, int);
+ char * getpass_x(const char *format, ...);
+ 
+ /* Globals */
+-int read_fd;                    /* The file descriptor to read from */
+-int write_fd;                   /* The file destriptor to write to */
+-char *program_name;             /* Guess what? */
+-int i_am_daemon;                /* Also... */
++extern int read_fd;                    /* The file descriptor to read from */
++extern int write_fd;                   /* The file descriptor to write to */
++extern char *program_name;             /* Guess what? */
++extern int i_am_daemon;                /* Also... */
+ 
+-PTSTREAM *stunnel;	/* stream representing the socket from us to proxy */
+-PTSTREAM *std;		/* stream representing stdin/stdout */
++extern PTSTREAM *stunnel;	/* stream representing the socket from us to proxy */
++extern PTSTREAM *std;		/* stream representing stdin/stdout */
+ 
+ /*
+  * All the command line options
+  */
+-struct gengetopt_args_info args_info;
++extern struct gengetopt_args_info args_info;
+ 
+ #define SIZE 65536
+-char buf[SIZE];         /* Data transfer buffer */
++extern char buf[SIZE];         /* Data transfer buffer */
+ 
+ /*
+  * Small MAX macro
diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
index eaf7123e2b0c..a8815f6b96e4 100644
--- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
+++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ BDEPEND="virtual/pkgconfig"
 DOCS=( CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO )
 PATCHES=(
 	"${FILESDIR}"/${PN}-allowTLS.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
 )
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/net-misc/python-x2go/Manifest b/net-misc/python-x2go/Manifest
index c5360eb04b3f..1511cfb7ab78 100644
--- a/net-misc/python-x2go/Manifest
+++ b/net-misc/python-x2go/Manifest
@@ -2,8 +2,8 @@ DIST python-x2go-0.6.0.2.tar.gz 243857 BLAKE2B 9e64ed5f28a231396ea5322c51942814d
 DIST python-x2go-0.6.1.1.tar.gz 247188 BLAKE2B c19f1ea39bca647984a21d0100d07c3898dbab894c92d5aa36c297ec277f9f0cd3429e02e6ca7a372b57ba3836d2139018e6d685fe31719549d2d2ddefff483a SHA512 8450ea47d1ec27abd56db0925613bd864a620cde98954f21d1fe8bcbf2a0024d4e8237c8663d04eb67c835f7d9f4a8c0dfc5f8f5671f571b24bb5b48b0a70762
 DIST python-x2go-0.6.1.2.tar.gz 247187 BLAKE2B dacaa406e7f32eb14951e54edd31fc812f7f6c5688a911607f4cf1755c1128eff5f2b77bb78b66f6a49df2267064cc1e8d209bcc1b368abff1b451d69eb63b04 SHA512 29ac73415c11f19e07a919bec99d61ba04f24e98c51bb32b5e4cdd20cbc04c7c6420727c5147b450e0e37931ee77dccc02334c62a8657c11bca6689472446e5d
 DIST python-x2go-0.6.1.3.tar.gz 247754 BLAKE2B 9c5705da9c1656a29ae7382dfaedb1798d8728006dbfcb0ec47441bba63a1c85f9ee60f0d8e5cb040dfec177ab72381518e0756ca5a9374e3ea7f1ab29d54dfb SHA512 3933ad8ee7debd6d643ce12ce06a6a98c7c97fae5a30f99ca147ce57ac7fa8e1b2fd97439a8c3b39ac5c5d0c7cecf4f3571193092e057db536d061f0d1d4accc
-EBUILD python-x2go-0.6.0.2.ebuild 598 BLAKE2B ef5b5b838576ee41d105433a87c7397d9c6e6527959216a65e80e40c61af21a0f0f8d929ba6c1eb9cb4adba076a390176ccd4253aa067e995c979d211d9768b3 SHA512 0f6d6c99a1dc934963a802c9cb616531e1720b2adf38d2c79cdd8a9d56dda5d38de879818960bc356070f387faa1a2529a9c2d2bea3dbca88f06123e44097cf6
-EBUILD python-x2go-0.6.1.1.ebuild 602 BLAKE2B 20996dbef1ee83cf9cb448d07b14a6002636949a511c3fdcd2821d0f00a044c5418fec8b12d04b86cb6b0872c388756f5b4ed921a8ad9a61ecbc41ab1e9da042 SHA512 c1ee3f2e34c2aa8cc365cf8d7aa504ddd75029c2cc7e722b8905d30a16371619c27e12632a6d5b3e5a495691d73167bb61166bb854fad1952e11806ac085b8ee
-EBUILD python-x2go-0.6.1.2.ebuild 602 BLAKE2B 20996dbef1ee83cf9cb448d07b14a6002636949a511c3fdcd2821d0f00a044c5418fec8b12d04b86cb6b0872c388756f5b4ed921a8ad9a61ecbc41ab1e9da042 SHA512 c1ee3f2e34c2aa8cc365cf8d7aa504ddd75029c2cc7e722b8905d30a16371619c27e12632a6d5b3e5a495691d73167bb61166bb854fad1952e11806ac085b8ee
-EBUILD python-x2go-0.6.1.3.ebuild 602 BLAKE2B 20996dbef1ee83cf9cb448d07b14a6002636949a511c3fdcd2821d0f00a044c5418fec8b12d04b86cb6b0872c388756f5b4ed921a8ad9a61ecbc41ab1e9da042 SHA512 c1ee3f2e34c2aa8cc365cf8d7aa504ddd75029c2cc7e722b8905d30a16371619c27e12632a6d5b3e5a495691d73167bb61166bb854fad1952e11806ac085b8ee
+EBUILD python-x2go-0.6.0.2.ebuild 588 BLAKE2B f1a035ab5e7993fb0e88b9d9165e4a1ed4026fb24e8003877fb9bdf89e85091136a0c4d16a0499d527f63ba32e76ecfae964389d14b0a6af389eb0417fec4984 SHA512 ca76f95f4668cad8460604a2e09d4ce1b151e6e51e485ed0590eb1b4323e2a9a5e8c6a321fe6ab2b0cd77a0a5c8f43e8f1f2e6b2395dc20819cac73ba66b4347
+EBUILD python-x2go-0.6.1.1.ebuild 592 BLAKE2B 01cf7279dbee1e23acd64155573f6fa0a335b7abf6d52b3923e1104f08f1410d4f305fb8f4df2d4f62f52dc539481307517eb34e4ca4e172f73103b547cc2726 SHA512 4134d2a11d4153a78f092f67e254559dc9c530969c06eeae932480fc9f8cf909ec99aacced42cc0597627029d9945f514a13a50c36e9cdeb7e86bade04ac75c5
+EBUILD python-x2go-0.6.1.2.ebuild 592 BLAKE2B 01cf7279dbee1e23acd64155573f6fa0a335b7abf6d52b3923e1104f08f1410d4f305fb8f4df2d4f62f52dc539481307517eb34e4ca4e172f73103b547cc2726 SHA512 4134d2a11d4153a78f092f67e254559dc9c530969c06eeae932480fc9f8cf909ec99aacced42cc0597627029d9945f514a13a50c36e9cdeb7e86bade04ac75c5
+EBUILD python-x2go-0.6.1.3.ebuild 592 BLAKE2B 01cf7279dbee1e23acd64155573f6fa0a335b7abf6d52b3923e1104f08f1410d4f305fb8f4df2d4f62f52dc539481307517eb34e4ca4e172f73103b547cc2726 SHA512 4134d2a11d4153a78f092f67e254559dc9c530969c06eeae932480fc9f8cf909ec99aacced42cc0597627029d9945f514a13a50c36e9cdeb7e86bade04ac75c5
 MISC metadata.xml 483 BLAKE2B 556d85d173fd848484a7ede8e26d1b66fcfc95c49c1231b12273a6e8bbc42c4421fbc1933f7aefa846369f474caa25163095774daf6be7680c6b3b79b09c3e67 SHA512 42c6decd895d3cf1097fc1e9a4a8eeeda0fff769a74fe4a74b17ba2943c76b63bc243d200b08d050aa1e778f3ee71f8a504f59384c79a54b220c7a022b23bc6e
diff --git a/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild b/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
index 26afdfe8c042..d1960870ac35 100644
--- a/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
index 5403c9b1cca4..cc5735fd8b96 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
index 5403c9b1cca4..cc5735fd8b96 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
index 5403c9b1cca4..cc5735fd8b96 100644
--- a/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
+++ b/net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="X2Go client-side Python API"
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 41fc0927ec0d..05fd0bd93d72 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -13,5 +13,5 @@ AUX systemd/ripngd.service 364 BLAKE2B e79e086c0bbe3ceb12fadc711a1c88a3403478080
 AUX systemd/zebra.service 354 BLAKE2B e22f8e321c5116179937e9c681482e779436092a10548ea4e564a0005f102a8d6dbba17fe5ef2a3952752f1ca6b1539841ccfee25b4a7b03b9e9faca1618004b SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a
 DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b056958ae2fa28bd2e9e8d9902e569a8f9a2925ba45396bb92e345bfcaf8ca1ef9136a433c615a5bd12a279e7c062939549a SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8
 DIST quagga-1.2.4.tar.gz 2925847 BLAKE2B e0e8d8b8e2243bc5cecc2e66d26040780f839414a16fb8a719d25a6fe1c29dc8545a92700a3758100715e1efb3d874584903885af51ef9f5d88c4a02d02dbc74 SHA512 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
-EBUILD quagga-1.2.4.ebuild 3704 BLAKE2B 09f203a9ec27a4511efbd4811e8fda9e413e0267db20e82b0d30583ce1bdc91646d250b78a3abbc7fdac73c44c63ce22e201266546ff3930d46c22d755d9093c SHA512 ef5693a9185ac57f64069d4a70bb9ce03fc61d0b920e736d56d218f25748fc453d0a77103cf38c010264cef327c3e56e4139678b24b750b9d42c6eeb7f2180cf
+EBUILD quagga-1.2.4.ebuild 3712 BLAKE2B 67a925e3be9203279a35fad326d8957906609f37f7411408af8cb1d7c12b269e6fff1f4562d33c1378c9b3489a415c817d90316243a85f070a3bec8446359c94 SHA512 445a745b91ae3693fa5ffe5f1544d2c548c49e56f196849db368a9dd552af77f39b9309aa3c7916dabb878f7cc3d0f1aa922bbb2b8d3b16b1aba0f3ff31d3a39
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.4.ebuild b/net-misc/quagga/quagga-1.2.4.ebuild
index b9c53ea591eb..7ae80aba9342 100644
--- a/net-misc/quagga/quagga-1.2.4.ebuild
+++ b/net-misc/quagga/quagga-1.2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
 
-inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles user
+inherit autotools eutils flag-o-matic ltprune multilib pam readme.gentoo-r1 systemd tmpfiles user
 
 DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
 HOMEPAGE="https://www.quagga.net/"
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index cebc1a050547..4bd4f6f0ca3a 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -2,9 +2,13 @@ DIST rclone-1.45.tar.gz 16494131 BLAKE2B 17ca4182af4efe23a367fc38226dc7fe146da55
 DIST rclone-1.47.0.tar.gz 17282254 BLAKE2B 57c4f3576427778db0fdc523d8b95b33db5cebfb0081d927abc8925eeaf90c0d2079f1d9572e81faac41e98cfee3028f39c9aed89e6db17188efb3541e3daa6a SHA512 90e68021f589bfad95989b45d91c47da63066e9bc60040052e866d1c7e420bc2784335cc5dbab0e4372c4f8686acb0a65853877c41081c8406eddada42550125
 DIST rclone-1.49.1.tar.gz 18196519 BLAKE2B 22a2f5984f65a64972c40fa845f0b4e5a8d52840ee9dc35463605e3eea399ab01a3b36f1f25a07d5c583829684863b8cbeaf82282e9b59ca994a8fa1d9558ebf SHA512 05b864932fdec7d1bc7185a4e2d33b7bd06b840399f100b1f58806e2ab6f752e4b7cb0f2691cfa92785f45b2f587aebaf7c9e5ab256c2d9b63c262d90ea1e3ac
 DIST rclone-1.50.0.tar.gz 18566931 BLAKE2B cfaf983ae972606b8ccc56ba505aec65bd7e6427f0b16f7e6187b079116b47eb3d297a99b505782c2bb5b64a5c8bf4e5b7beaee9dad5718ec952033ceca0945c SHA512 df805dc711ecf60b869ec957d224676643bcb6eac756470d2194338b9cc34e2a657d286d4a4308c743847fc11aa821b106888eb6ab9f04677bc70747c73fc5c1
+DIST rclone-1.50.2.tar.gz 18556334 BLAKE2B 4d8f3634928f49a5eae35de4be0cc73339fc35cbd4412b7fd03a2dbf4e45f50524153cd520251d0dd1bca52102511536c7bba0dff207a420e6d84c0ff48827b5 SHA512 30c0088f521132522a5813cf8eb3bdf704c2fefe391ecde3abd3f94969864d7872f095f0f431018b08bdc07f2e867d164311930c5fb51c06bc9581e9067205b2
+DIST rclone-1.51.0.tar.gz 18835242 BLAKE2B 5798a844c893e111e73ae409adcb06fd4291df3c0319bf983f2336ada45a60df253e750397bead55278cbb497c541a63498f695ce03af7b6cc1056f022ad2748 SHA512 b0881e09b75093abe4d31e95425a90513aed4a16d9e2dbf79023c9dc68875b90a1332204879530c450a16ab9cac475d967f7657d6f810a1e0f0d84b88d7de916
 EBUILD rclone-1.45.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
 EBUILD rclone-1.47.0.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
-EBUILD rclone-1.49.1.ebuild 860 BLAKE2B 3f6b7bebb4e5625d0524b6327321cc3381b1af24482fc7c2c39e6d8499fea8991af1986d81ea78ac6faefe0f76e77fec77319912ab123b2d12fb578ac3357060 SHA512 ac2af4aa2922e7479328fab6ae946bc0c0ef38be07b05b416bfda7e996dafa81f22b6ff784eecf7abedb8f091f9337b819245316a9d8c88aa05fb1cd80ab1102
-EBUILD rclone-1.50.0.ebuild 861 BLAKE2B 581edf762d4d29eeac5a0dd31dafad8b7f4e5bc526667d2a43f1af007c03ed685cfe14392073a98bd14794e074c0761ff522cb249b09b53460d7bc8de126dd63 SHA512 aefec4b32e62b234d7e4c56c126a0d99e80ceca2b942d9d649ef2602546614f79f27aac77874ffbb732ce2037017f905409ec9e6c5cd8f7f741d26a32eb5cb0c
-EBUILD rclone-9999.ebuild 861 BLAKE2B 581edf762d4d29eeac5a0dd31dafad8b7f4e5bc526667d2a43f1af007c03ed685cfe14392073a98bd14794e074c0761ff522cb249b09b53460d7bc8de126dd63 SHA512 aefec4b32e62b234d7e4c56c126a0d99e80ceca2b942d9d649ef2602546614f79f27aac77874ffbb732ce2037017f905409ec9e6c5cd8f7f741d26a32eb5cb0c
+EBUILD rclone-1.49.1.ebuild 858 BLAKE2B 81887cb1f6c195a24c6e42efe43be9ee2a5452aa04017d33d8d1e612bd14064ee026b62e0746d959b68a4892a81bc8f94f183167bf06b0d876d23eec241d755d SHA512 778f099d13c949abf0fe9632c0a4cee4a266b82f2ee5cd31486c0735ec096bfb9650543269111e1976c7c65a9069aa46bdc0041608e19f41c5d38375f7697cba
+EBUILD rclone-1.50.0.ebuild 859 BLAKE2B c84444316be2f96809efb9e2ed04eb00e6a83f99f2b41982b96f3cfb9e268fcfd6b5f9a4c615247f026a922644365291b92d9b0327a9814e9a7258f22786b564 SHA512 0bdf451731b68b2a2be681fef6cfdbd58846939fb843310c0a3b59cb402b6cc96075395c1b5ccfb8e4dc3d088b449fcb7f538bed779ba97aa9298db52ba7cdcb
+EBUILD rclone-1.50.2.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
+EBUILD rclone-1.51.0.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
+EBUILD rclone-9999.ebuild 861 BLAKE2B e0ad096016a740cadba21135d349fadd8a0dd4860492cb61bb21569c70e84733850707a53328f265faa2363436b0ae65013eea94d0805224087b027a5eac045e SHA512 129b7c912d8fc43fa46f50ca8c2fa02c2fb4abd51b19cb7e7d9173de0832e16c5f854386783435230ea3bb84227b3230ee34aaa9221bcf2ab64a2923414c6171
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.49.1.ebuild b/net-misc/rclone/rclone-1.49.1.ebuild
index 8c2e65193573..a19394f61d08 100644
--- a/net-misc/rclone/rclone-1.49.1.ebuild
+++ b/net-misc/rclone/rclone-1.49.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ EGO_PN="github.com/rclone/${PN}"
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/net-misc/rclone/rclone-1.50.0.ebuild b/net-misc/rclone/rclone-1.50.0.ebuild
index 8bec0f181760..4166391f5fac 100644
--- a/net-misc/rclone/rclone-1.50.0.ebuild
+++ b/net-misc/rclone/rclone-1.50.0.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
@@ -9,7 +9,7 @@ EGO_PN="github.com/rclone/${PN}"
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	EGIT_COMMIT="v${PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
diff --git a/net-misc/rclone/rclone-1.50.2.ebuild b/net-misc/rclone/rclone-1.50.2.ebuild
new file mode 100644
index 000000000000..d8704bb08407
--- /dev/null
+++ b/net-misc/rclone/rclone-1.50.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/rclone/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/rclone/rclone-1.51.0.ebuild b/net-misc/rclone/rclone-1.51.0.ebuild
new file mode 100644
index 000000000000..d8704bb08407
--- /dev/null
+++ b/net-misc/rclone/rclone-1.51.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/rclone/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/rclone/rclone-9999.ebuild b/net-misc/rclone/rclone-9999.ebuild
index 8bec0f181760..d8704bb08407 100644
--- a/net-misc/rclone/rclone-9999.ebuild
+++ b/net-misc/rclone/rclone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 2d5357c89727..4eff86323669 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,5 +1,5 @@
 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
-EBUILD rdate-1.4-r4.ebuild 811 BLAKE2B a149fd66f30ca55df0c8c643bc1969e822ba503303268f51530c3324e28174636301ab026c72088308788b1d7e5d72a9afa0b014710f2d3be9689c4a3f625473 SHA512 14664b6e91ca335cf937a15998c4b3ce9a004d5e8720ba1ef80a6bb54c409f18fcbe53ce58100537565a18bb46c22695a62f6f0ea999279187ea04638578b578
+EBUILD rdate-1.4-r4.ebuild 827 BLAKE2B 2e424b36be30fb5f96ffde7fce6e2db2a5e7229b5d08abb503fe475a57a811e750785f5b087eb437039fdbd14d766f1a77980706eeafed9d4db43eb77b99a46c SHA512 876bec67ff2da4c22aece0a806ddca38ef8f2e689c7e6b804665d632546a0004374b5786e4e3271d4c49a14ac87af9939c6537ac75907f4596802c7c19496ba1
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.4-r4.ebuild b/net-misc/rdate/rdate-1.4-r4.ebuild
index 7e2e7dceb4ba..49de8691a6c2 100644
--- a/net-misc/rdate/rdate-1.4-r4.ebuild
+++ b/net-misc/rdate/rdate-1.4-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
 HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 69ca6d587d19..878f294387cf 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -8,7 +8,7 @@ AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed71502
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 EBUILD rdesktop-1.8.6-r1.ebuild 1825 BLAKE2B 719b968928addf924edddc9e4266b0130d820e69c63672fbc6e4b29c9deed82782ec3fbb7ad4965d732ba19b48a3d7a7089941189b99b19864145407a48fc0c0 SHA512 252c717a7d630ff951400b5fe9100c1ad277fdf957522d37fb4ebb9f89fd4e2df94349084275edd0e8360caca3a85ed9d2e8bd859bf0aa1d11650a0d36efaf09
-EBUILD rdesktop-1.8.6.ebuild 1780 BLAKE2B 0bb065f30929881924e81c6dddea5992d6eb5733a8e209b179318080a4fb35d472aaa4ff822d6b02616da4ad1171966e53f3f46e3721954bb1c857b27329d9ef SHA512 fdf49ff957aaa8ca3dcf314f0812d29ac1b151ec8cf1543522a9b9dc2ee9dd9c5e85834903fe1890a9157142b5c6992523ba704773be6749a13983a009ec3a55
+EBUILD rdesktop-1.8.6.ebuild 1780 BLAKE2B cbeda239a94701cd91303c8c21009545fee34f8862c7efd838f971402c882c0409e6d9bb8c53c91adcb283f6b63501121010699410fcaee43454e3d7cbb68a44 SHA512 49a7f79a0bc7b142bec9d9f0481e6d980bed5fb3232f86b0b7a4cea28c64db6463488aff8f953c44b3f2ed4c938dbb8203261dac80efeba1bbb6a4d10a77b456
 EBUILD rdesktop-1.9.0-r1.ebuild 1754 BLAKE2B 79adaff612d40c744c52da54209fad124777057205e67dda8dc07e8419734e8869717f2a15bdad7538865ecdc0c4074058072e9a7e030a2ac9cdaadb3384d862 SHA512 83937bf9edccd2c54be4e2b2c244c9b2caa6bf450d7cb1b1bccb96538aafc9efb2ef89982eb9eeb4bfe22b69add88e954a1157b041de56c5c141d9c7de8a24ce
 EBUILD rdesktop-1.9.0.ebuild 1698 BLAKE2B e79aa0da4d76dd8c352ede9a97e24bd63f34109b05f9c91b248c175e76fa5047097fcba2110cf5a84322fcf57de07b53d7b65d60cef8faeddc35fee2d3c0a507 SHA512 e0240cfce9e59089fc5bc0b88208dd9b78278bd9bc7c151f31356bd5cdc5151412e1db04dcbdcf302ab97c599b53e860bb13b19292c65793922f379dd09693f0
 MISC metadata.xml 883 BLAKE2B 9ad73132150a724eb69cf65c62aea7cb0530e45fb4ca0395bb916cc95f48452b2dbd34edc7116ef9b8184527ea2dee16213b419185eac7b5aba8346dc7978cbc SHA512 5a68b2d8f23e4039efd76a52ea19400b2d17dfb01d0cb16504914bd0e2fb6f0523a135e7e98a19d7a0f371c1b149cb9426fc308303a0fa09a0bd0ebd118c1ea2
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
index 29c8cfb1ab00..eafaa63738cf 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index ef8ccb49ba74..f51bf5d1a728 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -5,5 +5,5 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
-EBUILD rsync-3.1.3.ebuild 2792 BLAKE2B f676cf5ff0fe36f4378c3d1b7b3f68503e77b5038fe0886e938d43047a8f275410931087dc45b38f969453ab97432876bd1b0c95c9f95ec0145caafa460bdabb SHA512 5c554dcb10fbb5a9dd0c780d330c9659d8caa31dac357fd5a77e216e0c219f7772b4183cf6aeecedfceba8e31734e6758eb7f61624cf3aab73658ecd131090c1
+EBUILD rsync-3.1.3.ebuild 2792 BLAKE2B 5f6676dbf5d31e8b29d41f6aa8d53b1d4aa309135547a8d18850aed8a4974bd5b149f6662999dc56da3e6df6a712772eb183e0e1b808707ec3c9f90ea9d5953e SHA512 f346d1267114d55e045d88d088b2c7ba1e6b88719500744ebef4be2cfa9c812b23ec060890367df0d3837c3c1905c1b23a6d67e697674e198b6ddb8064de6614
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index 996e0477c39e..a9811a73aa31 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
index 391e858b310d..a46dbf06a77b 100644
--- a/net-misc/samplicator/Manifest
+++ b/net-misc/samplicator/Manifest
@@ -3,6 +3,6 @@ AUX samplicator.confd 199 BLAKE2B b360c0c8a092e54aedbc08807b114f18d189f79f8756cd
 AUX samplicator.initd 988 BLAKE2B 2a1266ab11dc15c11507e5be5f8d1b364bff9d48633b84a9ba28e88f2085eb742d4ddf8d1c14471cc7489963f736ac03570df8416617ed79326d3bebc7f4830c SHA512 7bb9ebdb7d4b50d0df4827926b2ee6f9aaba0b63f841f6cb62d1dc2dcdf517e5a8e155813dab33e846270b9cb589c82e47ac293b4ab6482e504955856c68bc99
 DIST samplicator-1.3.6.tar.gz 87901 BLAKE2B 0ee1a7900c941e5c92c722cbc1c7308be8025cded04d4ddce5a496f3c3cc44d3973f3e1562147f5077d0cab6caa1cba12c0e5225b70d60bb07c32e7f8f2f6b8a SHA512 a4023344ec911d3dc6992ddce139e6f1c86a67bd9948a3f92a995dc26aeda1753becea4b0f5d9ad45a06d628029bffc0a77c28fbd277da9faf42100c01d55f31
 DIST samplicator-1.3.8rc1.tar.gz 109870 BLAKE2B 2ff442733216d6489028117936460ba8436af2f92982ac819a1d824ec5e07cf7f43c01e6de9abd9d50005e3bb8d5d91a64570bb805eefafee4bda14fac11d6d0 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306
-EBUILD samplicator-1.3.6.ebuild 1542 BLAKE2B 73705d12b17a86d4f7746d86994e92fc95824f3edad2dc9c02d8065c8a2f8c3085ffeced6a899c6ac58a247f9270913e0d473580c2699788d78ebae493387f5b SHA512 e78865fd2d5f9ff6e5bd29c9cef05e4238aad9515f624a6fa1dc255bf7c08ccf2acf2c664846e1e6a7db3f1e86a7d6ee2303431a68634feb43c2131f32a19375
-EBUILD samplicator-1.3.8_rc1.ebuild 1607 BLAKE2B 0bb16fd5be0b3d90a66e0c3ce3f7fe99a52e31cd315505402f871176b9a50702abcf0972865ac7fd83e2778d209cecaeb8deeb974518d98dc6e1b521be027407 SHA512 b58bf58dc2a82fde8da31125535ab135bc74b1fff4338ad03f45a47300b5cbb6b2a9bbcfbbbe6c8b8582aa376e293f533ed8c26d179d0bd752adf5c7d7d85539
+EBUILD samplicator-1.3.6.ebuild 1539 BLAKE2B 58293b65d0eb48d8b0238f194f93b5a1d6b3e5e1b47206fdbfd05cd1ad80283b6c3e69a8707f57b901086aa6cd231231190ec2e71c58409e2b6ff53aad252835 SHA512 a81f6ca6783aaf2b77edde24c8fdbdb459371f3894cbdfee720a83aaf46741f9d646847cc9d7bcf759cec5bfc46cd5b80594e09b71c5e541acf21371485215af
+EBUILD samplicator-1.3.8_rc1.ebuild 1604 BLAKE2B 208ef2cc6f5b73989dbb526a2e8d35e00656628fc914add727f12367d054e593fff811529c4312b1696d1624babe22058a5aee0db2e6306ff9126277f3a9b073 SHA512 7177a502bcc332632250a6d4be65d7cbdd1a243cc5410a091bf61764c20b615ed280be62f5e8cb6a5edb5ed1ffabc3fd4e5442e3656e2c7f4f3727cfb8f219ae
 MISC metadata.xml 816 BLAKE2B a9153d3127cd86761dd1163f2ca8df8bc7ef2191bbba211a37999004d74f2e7ff32460b9eff3bda68dd6e1b5e96b638ac5a32ae5ffd4f4ecf2cf61342a6c8e88 SHA512 95e2021fe0539b320556156c01810e133a2abf75858cd5f57261704c1b98765cbea51635b6e9cd9b485d60c9d7360456ec03ae9429ed1ae1b91c46e010c50e02
diff --git a/net-misc/samplicator/samplicator-1.3.6.ebuild b/net-misc/samplicator/samplicator-1.3.6.ebuild
index 9a0dc3dba6c6..9a434494afdd 100644
--- a/net-misc/samplicator/samplicator-1.3.6.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
index a3aec7839f99..db20a1619e9d 100644
--- a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/secpanel/Manifest b/net-misc/secpanel/Manifest
index 5a12288df1c1..4dd11e8987e5 100644
--- a/net-misc/secpanel/Manifest
+++ b/net-misc/secpanel/Manifest
@@ -1,3 +1,3 @@
 DIST secpanel-0.6.1.tgz 51417 BLAKE2B ebabd11ed218cc9c7816f996f7d424058b433f6be2d07d61be47a8c5fefa1a244cda243ceb2899d90ad3b7547d152c021d4c850980297b3657a1d62eaee190d0 SHA512 9cb654c1aa1fbb81c948b95194bc6198df0e3411e39bef09156d516c5ed2980ea364dc2f60e1549e6224e738a6bdeee26fa8e091aa3ba2d8e1f1fd2cc59c4ce1
-EBUILD secpanel-0.6.1-r1.ebuild 1234 BLAKE2B 401c268e76eee9ecad86c46832c9f6dbeb07d7fea355239a76881f9de766bb21d08166280e92c1c4b94a66f4170491da39f549478444ee930da3f10d4396f9da SHA512 925dbd2f87b8d145184c2cd7260f95217c2faaa9db5cdbbd25c725c8d8fcaa731721b236bd7a2014c5fa169504debc5ac5d33488a3a62fe4609c37a42016fb61
+EBUILD secpanel-0.6.1-r1.ebuild 1234 BLAKE2B b5a3a357881302e902a7ab69b7005f3b1ca5088774a6d21eb68eff37562d7e7e2343c894be47af58dcfff205abc14c869a7c8ad394069cd6441e332a90b2d6f5 SHA512 6b5de6ab7f1153047c686724235fae05a08fcfd56fb9456cae8b1565bc8335c1b399bd85645f2bbcf83007c0594e8cabec7ffd59fcdc436f1b5a8e447140c3f6
 MISC metadata.xml 423 BLAKE2B a0199154e9c3000e3b87f96f292a8f3dbba2cfd83db6acd49358550d3cce7e934c4c2f9860faf76b797c5940883bbec52a5ad0854ba1f870d32490df8e8377ce SHA512 4f7214bbffb870f731d97c952c99afdb73b1252d3bb5d4d1589bf80d19a3e1a8fa69c76d28caa4127eca886e13679454ef427223a9a2736b0888fd281268c4b1
diff --git a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild
index 7c7238369f35..cf5470690f02 100644
--- a/net-misc/secpanel/secpanel-0.6.1-r1.ebuild
+++ b/net-misc/secpanel/secpanel-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 8bbc1f7bac6f..dc5ae0795637 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,3 @@
 DIST smb4k-3.0.2.tar.xz 3824972 BLAKE2B 6f15bac77840669b9f9a6640e35f5b36b76653946bcef9d268452fd813c796480594b40744cf86ec5d79307294fb2f9592dc71013576efcb6c8fc607599778b9 SHA512 b60d50732ba84bae9e58f90ec18bb0fe59185814ec92e4f8adc1e699cfce61019f919fbdac2555b365c495ab1720f62b35b95c063f0c7c9466dc31487b8cb564
-EBUILD smb4k-3.0.2.ebuild 1885 BLAKE2B 9691707dd4a740bd5362589fff7dd94512321290766614db09d9eb2279ba21b0bb1275db5f1212caa562a58fe3bfb1b356bf3000fc3d26643ba185fa9e07ceb2 SHA512 a5dd55ad106eec283ad5d8df383d5cd0c362806e0caa20dfe5705d78b9894ebd2135d746f39ec8a41d746e43c66eca1916d65b1aefd9bf9a771221aee6f59675
+EBUILD smb4k-3.0.2.ebuild 1885 BLAKE2B efa1e961a32e1a566f0a0e41784510a044bb76153adac30a8b6bd1239fe279225cd2154fa0835d9674b3bc964d7b801204bb36196774434d06450fc9bf2fd32f SHA512 f1362a9c1b17ecbc0d07ed7c1b25e1d267fd26d0398b0a9ea7852f2f347e7a31ac2ac8eff43712f657ad2977d003cf36447ed28c090143a52d704ff3725463f6
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.2.ebuild b/net-misc/smb4k/smb4k-3.0.2.ebuild
index e0e0813da5aa..cb76ae6313d8 100644
--- a/net-misc/smb4k/smb4k-3.0.2.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/snarf/Manifest b/net-misc/snarf/Manifest
index e8008c68a226..3fb4c2653bc5 100644
--- a/net-misc/snarf/Manifest
+++ b/net-misc/snarf/Manifest
@@ -2,5 +2,5 @@ AUX snarf-basename-patch.diff 4438 BLAKE2B 0d5e9ee5efb26de8d622b6bbcacd2efe49c9d
 AUX snarf-fix-off-by-ones.diff 1592 BLAKE2B 5d6e72b792ceb95c40185211d3e1221afec730013ae8ae58f2406f2c71a230e34df282ed4323e5d27eecf7f16c1ea63d59d605e80b00e88db9fadfd9f05d4b8c SHA512 0e42437031fbfacbfaaeb76432b19ff65cd979cfebb0b17adef230fae75bc69cafccc386f95f656c1d40f01a849f0e4daa0d027fb78d97932ac5881c22e0cfb6
 AUX snarf-unlink-empty.diff 1581 BLAKE2B 09cd54db80c7b427cf84f413ac9253eb1aab44d3c4999e5c005c4fc9cfe45dfc280c2a7cf855545ab3f41896a1a5196662d628264f7384730450d7f0b6e7619f SHA512 bb33a2b5c4d929d8a35fce94812c8231f76b54914c9dc57d07dee7bf311e4fd034a97a343c588eba5479cbacd406cb82acc1835e15c911cd04100eff2dd3d398
 DIST snarf-7.0.tar.gz 64495 BLAKE2B d91930e0578a4a89b200a76aa69834d5f7c974a280c56d3c5f4a6f6b4e127145c90a397c410cb339d0865468a53aa433c7387dc2cb205ef8decd2f7a794168d0 SHA512 311c3e4a1b32fd024da8a5c8167888f254608d538695e30b3c632c606f67d1e3d94d8c88deb7850f782f38412f1bfd9022b0ee780c8644655f0648ccf0a0354e
-EBUILD snarf-7.0-r4.ebuild 877 BLAKE2B 7d3045d3c3bc8d8748e8ec84eff1aa5c68872ccbffa3bcf6dfa569460fe070eac38d52c9011651c04c4e8c7f3d02498eeeff3032aae2f200d08e09914356b3f6 SHA512 e64e67a642332c88206059bac34f54b8171b09c237a15bf2d5a14bad6922c458221ede82034272608c862ddef5033f6aec63bee364b465c5e5d511a68ae71cd3
+EBUILD snarf-7.0-r4.ebuild 874 BLAKE2B e5b522d1082a482f0d5ed1554059003cd01247c3c688feec6445ad51ba9d2b8cb977ddf54a415f066b9b57e8ef7934e6d83b474ebb4f5cdb305ea09452346c03 SHA512 34abbd5a85a0f08e60ea90f0380a061ec4720f75df2bf03768baf242c2c62f941820168d63aaf2f4696f65fbb971badb2a5cc589d89e01c8b71757687476bbd0
 MISC metadata.xml 386 BLAKE2B d3a94565f431c48179a81f6699a36b362e12acdea5565186d5ca41286308c943c7ee99c3511ae22acba8128b82608f3feb076147ec95d53f98e159421934b8b7 SHA512 07d79153adfb5b7d447668c0fb6d22db9c2c026d5adfca658999107018ca392e55fb673273de986263479e493133e143a2523ef6133867db5c65a8f84f6a220a
diff --git a/net-misc/snarf/snarf-7.0-r4.ebuild b/net-misc/snarf/snarf-7.0-r4.ebuild
index 2a087d833a44..a5e2107fea38 100644
--- a/net-misc/snarf/snarf-7.0-r4.ebuild
+++ b/net-misc/snarf/snarf-7.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 0d1a084a3e50..b2f59d3c3822 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -7,7 +7,7 @@ DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb816
 DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce SHA512 6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.3.2.ebuild 1526 BLAKE2B e4fc6ae1f88dd9bbe5526a3dc7a2fb25c1297074c802d61bcdf421043f97b8965a082bb4245e9fde3b5d9e97d6d1d107fd7997bfa6f12fdb0be21a8356b5a6cd SHA512 6a91b9ef9ff2d5d46ad4321f3db9cb51b479ee7110f20673bb87eee18e6b7fc12dde6e30adc03aca33c41619f1714bd89495e62b6a4963a0318cefa0137a8255
+EBUILD socat-1.7.3.2.ebuild 1523 BLAKE2B ffd838f801aea14990c2af21fc9f4ed058a39a678e3f8aa2fbe73ae1bd39b673ade302cd6254146d179be8a33078cbcabd7bb04201f8b5cbce4db8bb7a346177 SHA512 476cd805c8b1f0c2c535215faa7dd9824b2fa35a9382c90754c8b7df6fb2a4e12102518d9596c9af4b3d47b0ab02c8169091c247b93dd2b4bd0aa2c9ec39d769
 EBUILD socat-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f
 EBUILD socat-1.7.3.4.ebuild 1481 BLAKE2B ab96720ec89007301e4be9e8fad56b0101df043243b63355675dd2213862e780c270b530f85f8a806acb2ef392a41132732c93354319dca7567b6cd2ede4cf9a SHA512 fb9606c2dc6ed267cc5e52694c1ba740cacfcafe151e00366eb8aa1b7060b164c6e6945ff12ca44f1a7f6e3b4f70f6bf3c8bf913de69d9faa9d675e8f447b74a
 EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18
diff --git a/net-misc/socat/socat-1.7.3.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild
index e869de841c99..fabfafe08ad3 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index cd8de7669a35..3de5e0219350 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -3,7 +3,7 @@ AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d
 AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
-EBUILD spice-gtk-0.35.ebuild 3607 BLAKE2B 85b9ecbdd8cf0f7fd919325142c7bef634fcdc6985a18738f032bc5671fb4f57d79eeb20792cdc908ccc6ec82844250bc0031bc4b399dee822a480ab94c0842d SHA512 c0a4ed0daac8b060615f7edbcbf1518dbc38a895c48b4192e1a7f4acb1feed31b7179f5636d95cc63a1dd5f7872ab44db9e27512e1036a303f41f3fc610d0b0d
+EBUILD spice-gtk-0.35.ebuild 3615 BLAKE2B 8fc23e955020a982699667345dcd2f6a874dce2465bb860ccb850f7448fed5fba005b80d2fa9fe30b98ea1f150b72a8bc28e809a6aa0da42c36a3a419397db5d SHA512 c091e7d04abecc7c0c42f7c47c02eb7910c6fd1776b962b613966b3a1604e3edba0696cf18d4e1675ae6495f8edf12f95186336a2d352beef4822f58d2894a33
 EBUILD spice-gtk-0.37-r2.ebuild 3739 BLAKE2B df139b67cd3c1038e07662b9afcf8c4bdd4a79fad2d624366287563ee695df045c2cf5aeefd575af45bc703491e491887945ea225995d18deb012e2a3ba416f0 SHA512 71688a1d0c8de4e360a67c91ef1f313ba05515393354f32980084f2438cebdec410c4e0ec060128549b7eeba38d1c80dbcadf41cb18d7cb0115d470f525bbd81
 EBUILD spice-gtk-9999.ebuild 3394 BLAKE2B 2014ce9d0d762a51286f1f0b6cf7802606dad6dba0c2fe7e83ffd005828c81a0f09287de4561f51ea897195ed2261b5bba354d938b0d3ff518ef725d681e7759 SHA512 f9c4cd502006ce73f3129d32907e3e52ff2a217f497021ce398f49a6e2c422e2ae6de61acc70c250778a2a6fcfc09baed4f9577f9cb65aeefa7d713bbf5e7a85
 MISC metadata.xml 1072 BLAKE2B 0dec19853765b4a606a94fb31df1e6d569bc0131a7e2a9a28d822218b7f11d0d039d27d9bf4cdc43e073ed2ea433f1af7971a48a0529cd46b10f45f7b5ec1ff7 SHA512 8f94f0d99d6bfefba369f974d0b8358f86f5e3910279e5ab8ccb08b5ffb428f911ae64bb8904415e330c543609ee46c2dbd68f34912b50aca3929016fcac26de
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index 07b64a227a3c..485627726ec5 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ GCONF_DEBUG="no"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
+inherit autotools eutils ltprune xdg-utils vala readme.gentoo-r1
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 4026a4c10f5d..50a35533113d 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,5 +1,5 @@
 AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 BLAKE2B d968d7f1abf69cc5c0fd3c72c690bca1e547b8f0a58424c59ce20c1570c5151b5313b18396f1462804ab0598672129ad31eb3036bb3590304eed733df69b18f9 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
 DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 BLAKE2B c47e3123f94504162cec237d6c2ff61825b655efaa9bff2710650cce3e2cb45b10ff842c4d88002461ab51c410dd9fc748ee4cdca7cea56e67bc22497b427e7b SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b
-EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 980 BLAKE2B 06461b65dabf719c02dc4cf106dd2d490f9da60593832c385d3d32a4361b0a68f887422245585baccc2bbb984cb6f65e6cc09a828f1b9cdf92851c6f820c5126 SHA512 c1a5b4994f89a9351254f0fdee52be2dccf9908e93117e08aed42d3718317a0055c3b6927f9fc5179f65cfb993e6ebd884f41061e37714524afe745d16524cbd
+EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 977 BLAKE2B 0df1c7bed356cb4462e98bfaea51c7b400f832bd3b6ece7680387ff8913549cdc103f7ee801b815b3acf842cc687a88b028ef9e74aa7b0364644694a5e0c8cab SHA512 39fa7d7b45b67ba667e129809deb4b6a21bc8452b39e2ae625fe89779498b55dcbc0e81c99c918b1cc58f9431b14956bedc21832cd1b12faad988203dcec679e
 MISC metadata.xml 344 BLAKE2B 2059c989d9bd878eb050b6960dbe5444bd72eaecf4d6f532b2cfb26c830f65010cf7081e2e2a435d541f0b03f904697966ffbcdd7bc41281319689cc65b12163 SHA512 26eb499745d0f954b33834ebecef34ba44ad457837ea4c0b0a44e917513aabe6486887124ac5ce47d69c1756f2a00693ced7ed4dabcb35539d047f19deeb33f0
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
index a4c73d0d7b68..d2f6c5846bb0 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
diff --git a/net-misc/ssh-chain/Manifest b/net-misc/ssh-chain/Manifest
index 8ddd3d1e29ca..23aa8313fdf8 100644
--- a/net-misc/ssh-chain/Manifest
+++ b/net-misc/ssh-chain/Manifest
@@ -1,3 +1,3 @@
 DIST ssh-chain-20131217.tar.gz 3956 BLAKE2B 64df261f9dac1d614d9095cd77b407cb6da44cd1cf97b043834670df63bb5abb7397074c073d7c0a2c10edf1cc19fcda8182a9e1ecac6b8a58a07f793e524d0c SHA512 7d9faa9bbce44a50ca56d65fd778d35f79c7ece982e2bb0e424471c866f9cc584390484dbed73447473016fe5de4564e22883d3dda4aa54e167853a3e0ce2975
-EBUILD ssh-chain-20131217.ebuild 826 BLAKE2B d7402d6dd3111adaec2a37199367a33b39fbc0bddecc9c9f6253f1878eedeca9dcb83d7921d475fb3ec13cc1bf2395993947b748f5177832d3ebc1ccae0ccf10 SHA512 bea8e8094dcc1965eb45b77f29889ee65582755edb3ff05ab635cc80bedba40b066bff8188fa71ad0998ee303926f77720232b1f13492072c11e9b9e3e1383c2
+EBUILD ssh-chain-20131217.ebuild 823 BLAKE2B d80272ed78121e6aa1da0ce763aece3362d765a9a18a9a164743bce2f5617b4c06175e7806dd71b463a5120c9cd662f1b68cc8f92b1d063fa981b1766d0345b4 SHA512 32b8a34bb7177bba0ba5b842ee9e331d0842acba53daa0fed959a7913eb402e8f50647576120be7b95bd2f343e683ca1568fd3a32f070684ecd474eca6fa0192
 MISC metadata.xml 339 BLAKE2B d88a6cff684d3e348f9cd681a48578fd57d774ff0ba3cb1f80308fe1c38a5d72ddd02b54f18a292464c517b5400d804b1685093648ed97b9508a2db9f33e7d74 SHA512 573a755a2936fdf1abb1fbca32a61d3b6bb097ae70cdb75348fca0c5d031e9a55e85e97ba4d56d658581430c68500c10a7a46c48d89d21a31ba24481be179681
diff --git a/net-misc/ssh-chain/ssh-chain-20131217.ebuild b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
index c20032d46e66..45a56747325f 100644
--- a/net-misc/ssh-chain/ssh-chain-20131217.ebuild
+++ b/net-misc/ssh-chain/ssh-chain-20131217.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index 66fc14934983..dc7b75e1d8a5 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -22,5 +22,5 @@ AUX patches/stg-2.408-static-libs.patch 198 BLAKE2B 2ad854cd7ac7f9bf8a01aa8cfbb8
 AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf83893e3d038628a1ca7db92d3f3b8144cf44ccc7aa694686c77e6514867048841f1f57d61f SHA512 21cb21a5a14901f3b370f2cedb6ede9414c1080d3d4e073ed048f005f40622179cd91e8cf80f609f0a7b5cacecff5f15913a5cf954dfff56ad036649f4a0a48f
 AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
 DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
-EBUILD stargazer-2.408-r1.ebuild 17361 BLAKE2B 28865db200c061ce0e1bfe9b3fddeb527bed986608d8e2eace0d69f87fed514d93b8034aa0e8f986db1cf9590575f54f1928f9a2a6db254f1b76a349d63ec6ad SHA512 14565cd03606981febc297263fdd22ae6ef5718b85b225cac8d5dc7f64f929c1b2e047118a43c1c98c704fe75b1b3c2396885311cda51cc8a8779b6ae80e98f0
+EBUILD stargazer-2.408-r1.ebuild 17361 BLAKE2B 57d5aecbe3289c9da5b214664d5cfb1547f04566bb3897cfb9efd08da9db60b0b1da093eaad2705309fad6e5c028ca806d250590c4a5ab047b4bc4735f0486df SHA512 7f68d15263b281b1e1e308d0a49d378532c5446c6f864fd994890913d13157f5cbd0da055a9a0ef24c37cffa96e8ae0e1bff44ad8bfd6ff23e0ab8d8133b6f12
 MISC metadata.xml 4163 BLAKE2B 8b56f499cd2f996cef1d15ff7f01dffaa6f76577ac437b7e040a5b8c49272b2eed8f680d6f2ed8c9e2512326971aa5e5a66b06f408341af7add6caa076c74e9f SHA512 60e4a6fc5304feb38c6ccc5fa3dc69df9c600289a65779d6d957b0252262a371c1cca02ae51f4538c7d4d006d0b03040a18a478011a31656562d2e36fce668fa
diff --git a/net-misc/stargazer/stargazer-2.408-r1.ebuild b/net-misc/stargazer/stargazer-2.408-r1.ebuild
index d8372e8418af..f4c6cf050b71 100644
--- a/net-misc/stargazer/stargazer-2.408-r1.ebuild
+++ b/net-misc/stargazer/stargazer-2.408-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
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 508d2391b882..ae2ac732a011 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 be36507152332b571dd6922de225fd72a98e783e770a60cadcf1ebb34974c9c5336a130ab62d889779ede3e380888f574db431db02d9a1702e1aa9f7e8cf64e4 SHA512 9ab17b72af5677d418a78ef7a69e40edefa80dd1f49d23dc3cfa0ef85589feda297457652bd608b17818c45a2d5964c8540274acae326a6810f424e33c405ecb
-EBUILD stunnel-5.55.ebuild 2774 BLAKE2B 2d7325626d894e37f4a8cb1e3eb806686c8c87dc303aa79ae9ab0d63f7c07e867e5a1900f2342faca2db0772f96d224f57061b38f510aa9daaa7c597a24b40a6 SHA512 e7660604dd19f87af9ebfbfb551c0d0b0c8c2a4c3a59a1f20d51f4482a4558e86515ae5ab717af7814ce26ed04b31093f02e5f2f06dd9ac63ee68d0d115e9b12
+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
 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 c482924d3ef4..7b5858d832fc 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-misc/stunnel/stunnel-5.55.ebuild b/net-misc/stunnel/stunnel-5.55.ebuild
index 0b7a770f6657..f1faaae643f2 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 26d18a47b18b..85750a0d44a7 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -2,5 +2,5 @@ AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc
 DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
 DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
 EBUILD suite3270-3.5_p12.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
-EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B ee6028b2f735c8613a09fefb1adf341e901b7030b0a9008bed3687ecaf8335200d1750a7e34c62ceb99bdc8767f1895d8f1727f823abcede2f951c43a86a360f SHA512 339864c4e04fc6bfc30268810c139d56d6948f87c4128a069b6c3350f3c439c076f58045df3e9a1ae5c650cca5d7f76b9f8ac312cce3784ff6095d813f2e7768
+EBUILD suite3270-3.6_p8.ebuild 2126 BLAKE2B 6af9b8a731e933740f3ebf1f260251d7c91806f32bc70f3bf26a914227c7ef7bd9592fb898f1a8e2fbb7eeed0c703cfbd82a2bdbe0973512007f674fc2b8b908 SHA512 6d834fc4455625b414b2b19b509b71dc6a19501ff301fe15acb49c0e0fb632ef5d3ffac10e72e7ea593c00541c4bf0010a526d9c14c6e9ca077d76ef09672a33
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index bcd2a887e4b8..d8c130a16927 100644
--- a/net-misc/suite3270/suite3270-3.6_p8.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index 802ac5fba301..6026d04b0ce9 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -1,5 +1,5 @@
 AUX taylor-uucp-1.07-fprintf.patch 188 BLAKE2B 13900fdaffd964d5e38a4bc3d2acce2675ba74ee008676d97313b4b75ee5625aeff5b56fbdb1a89909fa4cb006102e43f65a2832a1805fb747608eb13054ebfe SHA512 468870a9e64f0ace876bc1254e264e634fc07011b9ffa5ca0ccecb23c925e2a4a5c4463e6741b265bc8df17d0a578710cc8ea135461a1dfcd1c782e991bc7623
 AUX taylor-uucp-1.07-gentoo.patch 5049 BLAKE2B 3d010ff0841df59196d38e7450b85c4d36c2ccd770a4c31d29962e3c3f87d5a264977fa2f715a9bb91fec44f60dd5e045eed440e0fb482be525702497f3ad2a1 SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a
 DIST uucp-1.07.tar.gz 1013234 BLAKE2B 5734bd1b8afcc9cb9b0dcc25afe73ee89b6007249a73d286bc39975bc0cd7a1907e360dfaa050175d87e34a7d468a70a7cae75124c920f00f03ff52f16629bb3 SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b
-EBUILD taylor-uucp-1.07-r3.ebuild 1370 BLAKE2B 3fff4e59b87b50e4efdbda93c496c7715a639cd2f6e509de8c5e499fba034ecdeda9f5eb2ff72fe36f3552b099ed23da201761f38d695b19002280267cfe07dc SHA512 68fb6859e59dfbe1f60e35ac73efc88121e90a49913696868de7bd117928761583e185c7f2a74ed8d17c28613335b19e5743a272ee214094c6462a237c8d7301
+EBUILD taylor-uucp-1.07-r3.ebuild 1367 BLAKE2B 48208978c92ac8d3c3405289991c34a66e4dcf606c2a2b3518ccde80fa9dd8e8b23c2044d8915d7d0828eaee8a4927a26cc9738eed980289d63c02dcaded79c4 SHA512 f1f94f5a4db250c61a5dcef62787e101640ad5a59f056b06c966b7e302935291ea74f7b1682908a56b0538a8131cd29bb4417a1a668f4f444fb931c8cf719a70
 MISC metadata.xml 319 BLAKE2B f7bd226c6082b2d19d38b6d20aa6d859e6076e226cf2ae3a4013ee5ff558f7dba27cee1fcd159785679fe03b37082d57232d7ecf6f86e832a60e3d8c4f528d57 SHA512 14fddbb3e6a6f0defe184c909d8ae29072782e3060dd5c91f852572039ca81be95f9cae98f6a4a011711cd991bcfa886638d725372463b3af4ee7f15654ad22d
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
index 2783047c8391..b78e5191701f 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-misc/tcpsound/Manifest b/net-misc/tcpsound/Manifest
index 1aa4bf975b4e..4840d968fe95 100644
--- a/net-misc/tcpsound/Manifest
+++ b/net-misc/tcpsound/Manifest
@@ -1,5 +1,5 @@
 AUX tcpsound-0.3.1-makefile.patch 1573 BLAKE2B ea791c209bb065da0185451fd463d47ed9bde74d9bd03312853baaf129ad37cff0eab6b9ecd67700c49439a08588a2c25e62a8e3b6b7494acde740603a472c7d SHA512 6ae771f09bebdf265ca8e4b7efb0201140088f76dbfc13187b362641c2eea033d4b4a1f9a58661bd6c678d86bf54740dad0b101700f546a56ae5a0801b58fbd0
 AUX tcpsound-0.3.1-misc.patch 983 BLAKE2B 33edb9a8322698f9da2c3cefcd96b510595552c010c406705a707577433ecc42e7f50818467ec5df38f79014a7d95300cc1dc9ba3b67caf8b64e834451a1ea31 SHA512 48c37a7adba42c1a6279616ac05fa48794ad2ef2c5d810ca6866f74dedbc3b242841ef169007e0779e10f5db19bf1ae90fe87b595c543e34cb09998a84fc3156
 DIST tcpsound-0.3.1.tar.gz 155357 BLAKE2B ccab12232eb5b63c9baaffd866f3755cd7f8c0b71edff7508a0e823d805bc22d908d32eb48e1501870c4c3309be3a7b3ae029516848bf6decff4bcc6b5b53f8e SHA512 9db7c03f57f0e95b5b6b947bdeff9664dda6f6039e1080611205ca15648cb9b31325f462b31cbb1462a4aa767a9c89d6125c17144bb0dd7d0acf89e24b2f3055
-EBUILD tcpsound-0.3.1-r1.ebuild 633 BLAKE2B de546db8bc7d00b933ba0572350d0d2250a25a8a3753e3b036bf0d4a530059df7dabbafe07601ef5a1c457d5820a5e9faf25b4687f784b86c088673cb8ee7c1b SHA512 01066de8eeaaf66c26b92b983a919c369c0737e284d2f54ea908ed916d7ea19003e20c079df28293531fd093801a9eb6e30f1fdc76ab5203d9dcc458666e2413
+EBUILD tcpsound-0.3.1-r1.ebuild 630 BLAKE2B 0b37c8563b356dd94a4683ec8652eaf5c322a8187225ec3f74857a9b0149f57dcd0b10021a859e8ccf5f75640f650ae30ba4ae0d98b959741827ab2ca0b3f282 SHA512 922ef89bf649f50e611388df140b364eaee57b9899637015b96315315fa2250a6a84d521f4858242d9477207badad1d412d24f5718923a8653e4754f3b5162c1
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
index d21ae64313f4..fe5bb78e69cc 100644
--- a/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
+++ b/net-misc/tcpsound/tcpsound-0.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index 9a520989bd70..b73a84b8967b 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -2,5 +2,5 @@ AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c
 AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
-EBUILD telnet-bsd-1.2-r1.ebuild 1150 BLAKE2B 049bf23f8330fe516fe1b5ca15f473cb9666553910d895ce3ac4434054e3bac4e96943f4f01903806c2cd91bcd8bb2f27bef586013846b280f2d374fde9c3479 SHA512 e0b83f15de6431890ec1c9f262b3076ab5a968c0c75d3e739954ac7f5a15641e0c17f0fcb3cc60db52fb40b937a0a575636a97f54d817d657f015ec831e669b9
+EBUILD telnet-bsd-1.2-r1.ebuild 1147 BLAKE2B 8676dd12d7346529a9d92b45c2eedcee05ea229fc90d756d94ad958f2f7282aba1c57d7bfa7290ce3347ec3838b63298977b779a653428cf1e1191d0d9c08f21 SHA512 20e61d0d023d8f53c72a3fa804e69336320171d2b59daa214a0e21e7e9a5c9402dc37c78e241e479b9cf5a571c259d7f5056d48731da7829fcd3e7bc9d098cc4
 MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
index 9892e93a3e40..8fc40fcfe235 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-misc/termpkg/Manifest b/net-misc/termpkg/Manifest
index abdf1fdf113c..4eb40e63244f 100644
--- a/net-misc/termpkg/Manifest
+++ b/net-misc/termpkg/Manifest
@@ -6,5 +6,5 @@ AUX ttyd.confd 1894 BLAKE2B 6a46667d927fe0849901ea48c5b38ff0963ddbe6bece03731203
 AUX ttyd.initd 2222 BLAKE2B 84063dbeb213caa3414c6dfb1d75791fda451bc91e7f6b201dd55b4f8eba88cd239f6d01986c255899ec9679d465cae617e71b7c68b16c291811edeedb709c2c SHA512 d778644393722fa00837f542bbbd772afc86801bf875430321d287adb7129b605bd12d8dd3a49a79795b58b188b4e7febc13546e7181a1ede278f9fbb40e47bd
 DIST termpkg_3.3-9.1.diff.gz 6759 BLAKE2B 94e139b2dfc4844dd13df075f8d0ab8b7bff482618c55b56d5cc1d67706b10cf04b6b135566980d4742edc46dfc65dcdd1d254bef96a57f4b62c5250a520537c SHA512 dbcba1bc020ead0ef5e4f2fb2e7ee50937dbd6d614e53547bf2473dc3cbf0f4f3100a15bcd200b815a4fcbfd454a08a3185cdb305c4f3bde389070b5545293d4
 DIST termpkg_3.3.orig.tar.gz 65807 BLAKE2B c4382d6689b3bac1f22407e55dd18373b36be1de88f0678ac93bc0dc9c43f07bc2172e4be86ae250d5ed8e9c89991f1842457f97eb646ec8054353d525d9ad7a SHA512 4dc1152af27af5edda66622435f5c5d46e9bbba9dc3e9e0d6349792efef9488993d9ea02eb8780bc05a0a29756a0ba3cf45bf8d1799906b55d166c287432c22c
-EBUILD termpkg-3.3.9.1-r2.ebuild 1305 BLAKE2B 62f0230dde0681686ee74d53bb2d1ef23d7bd4c41e41acb8969eeb8a64111f0e2d74029632e8ef45e4935e5916b318106623ef8afd835bde0a03832a16d114ab SHA512 243d0bfd9535c6067aa42b6579e65be39d2a95a307c6c427c77f38ef2d30b9c63487649714606fa904917c505b05ffdcc2fb3f399e825c22831f14e1f315f1d8
+EBUILD termpkg-3.3.9.1-r2.ebuild 1318 BLAKE2B 2bec8adce6fe40d62be0faf08bf080962cd52648204e73145c22ae93d79d0c8d6559de9dab78ece82a26db495ffffae5ffb5525231856b226d58c92feef92ec7 SHA512 a661b3541915fa63feb9917f924f5eb28c2edb9a07fa8e1ae31099e5b6db4172993ea2e98fb4dfcfe179567da2eab60252ea5e41704e5170373abdc2358211a0
 MISC metadata.xml 618 BLAKE2B 9085f03cee7c7c04ff92f4c0672c956cceb06d47abb7f74fcc917452b6c209bf92e3f467efc596fbea85e0b703e840cf99a3b0e7a8a175e54c5e58931d8a08be SHA512 b82080f75078bb82c6ba021c631e8ddd4af719a523a70b1f921e3221a37b1e766918680cb77f9fbc9af74aacf9c196c3264720a95cbdd902f042b88f1c21f75f
diff --git a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
index 112f96195585..12eb8a94b92c 100644
--- a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
+++ b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-inherit base versionator
+inherit base toolchain-funcs versionator
 
 MY_PV=$(get_version_component_range 1-2)
 MY_PF=$(replace_version_separator 2 '-')
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
index 028d6ea32c78..64a6200c60c2 100644
--- a/net-misc/throttle/Manifest
+++ b/net-misc/throttle/Manifest
@@ -1,3 +1,3 @@
 DIST throttle-1.2.tar.gz 72501 BLAKE2B 8374d09f12f37f60a2dd52c5e3e08ef53af0862fdb51d530883f291b1d0ab2a1127dcc70a08d4179e3052788a84e9a8183db3dbb53ae8181e62fc3728005c7a3 SHA512 ec0a639e6fed5e4a5fbb32498a77e08e0b53f3d6ffdb1788a6b52480387c87c43a5d17507941c9660406721bdbd5d4eedd4d6f1c0153dc41dc44a2aae0f9492f
-EBUILD throttle-1.2-r1.ebuild 496 BLAKE2B 9e392fb19dcacb23a04e27132d3e3e531c8ae6949cec238c2583522cd06cb1c4df03e80f173ba7112677824ae3821ec3976487d695bb44fedf0781ec03ad6d14 SHA512 c16d0db7a23dd04c811863b1bb2ba62bef673f029e9196842967ed60f0b9d8c35c007afbe2bc5067ad9ca350026dc21b337f4ae47f6082b9ce2513b17c5efb6f
+EBUILD throttle-1.2-r1.ebuild 496 BLAKE2B 78d5fdc9641523fdc2f83b787323df011ee09e2e3028a6a0e0c678c93c9f359db83432c472632aa9324c1a981f5bb1f74c4dca843ebbcaf465c445cc69eeec16 SHA512 ab7a2d72971a035f1f97a8178e5f8ad469cf2e452e7234ce81e25cdf715f92c70ced27a741cf380d416ebbd3c55297b901a4e95fbe9e0ac6abaa1c260ed25efc
 MISC metadata.xml 370 BLAKE2B a472fb5ba4c9dd2f9d29f932befe96a997d27ed559ca0173388d6c8ca842032a34f2b4df8f962f6a275bddc83cc7498d5c971b79e91c5f4ef1314d52c7b4f954 SHA512 39d066692873cf85dc75f2d6f5c566ac799aa1e2fdc6743915d19167913f92800ade4be1d101780fc011362757531d8f59615e3d150a160f7196a43314d64c69
diff --git a/net-misc/throttle/throttle-1.2-r1.ebuild b/net-misc/throttle/throttle-1.2-r1.ebuild
index 15222cd4de12..b53fd5397ed9 100644
--- a/net-misc/throttle/throttle-1.2-r1.ebuild
+++ b/net-misc/throttle/throttle-1.2-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
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 7ccd39933fd7..d8d662065b3a 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,5 +6,5 @@ AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8
 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.9.0-r1.ebuild 4571 BLAKE2B 428fc75fa06c1190893da7a9c07acc58ffbd7c1585aad0bcf4c5e00d322cba1e314a5d15094aee7f8c1fddcd7e85185c94ff52b8037a6989f176d46f85bc56a7 SHA512 f536e604af19e7d8e362d3228701023f645ce3dc9939f113d0767e93f5507195881bf3f90994dd04c356b67071d880521e80edcf28907a11a2427d7997a702ce
+EBUILD tigervnc-1.9.0-r1.ebuild 4571 BLAKE2B 665f5cf2161814693e7eba806f9e7d6a222882163ed1ec3a4486af71f649029072c874278d8437ba2a54e10b3496476c412c4229a707fa6d3427d87e0072f160 SHA512 72172b2cddb740574f7a492027f77b0882dc9a57884de6d959939a25c6c5db5b9a3fe9228df3a9742a39d67c9f20ca1c2f91efd9dbe0349ee1d484c5bc5cf7cd
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 997dcfde1fb7..44eb551fcf83 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index a2694339ea50..ca2384ead6b2 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,5 +1,5 @@
 DIST linux-3.19.tar.xz 81688872 BLAKE2B 0b89e34e62d6fe42f43144fe4f3070df2d9a23831b231918946c1f19a1a4b881095892635983ac7afad902f366b0c6001e46751ed2c96890ecbe9d4056154be6 SHA512 d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c
 DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
-EBUILD usbip-3.19.ebuild 1172 BLAKE2B e9cbce584ed10c5782a8f885232e4a1c0bd5a225406520efa2cd4992af6fa7b1b6c12b70b172826b43d60184fdcb376233440f57a57eb2693e398edd6b400fef SHA512 2ae1c607c46d61ec1a85a530ebc3a3631788477d16c5372e8e54e15e5b9255130f6529ebcf42235f413df7a6ac5f844ce711d3332cc39155dfe637f53d6f2515
-EBUILD usbip-4.13.ebuild 1217 BLAKE2B f7e18daefe84e1587e70c7481acd0400dfa240d0b5675dd1faa3989a95b2be92a2c6877474500f5fb58cd49e08a5b91de7d703537556ab93dfb2d324113211f0 SHA512 1c1839f7ff0909bc28f4002f168df3fae8e59c72f146d258777d6339050122b52055a38109fb0502e53049fa38187f909d3c59486a5777fd51ed86f283f1f859
+EBUILD usbip-3.19.ebuild 1177 BLAKE2B a45830a8824c875cf6eef765e243ec49a05ff9869dbcb534d8267ba7de0cc5c037fab847e720717a21bdf5f56dfab0295aafe080718bea174c1d05ae220e561d SHA512 46f5a579e8e3051aee38f5d89803bb1d34de18f218b3ed404a4ce0018b6ea73988614a55f2d3c54f0095d4b7bac131580868d8a13b40759fb04346c80c6cf2fc
+EBUILD usbip-4.13.ebuild 1222 BLAKE2B 6b66773b165741225f41a7df753fe93e7a83090254c16a779fcbfea4d235beef6e20157f14c07df3e8de1710ff411891962c078a29be6ef7876bf1d8dc273fb1 SHA512 023a798189dc15bd58e962c0869003a650ee9cebe9c43b934c3c517aa5072771e4369fbcd0242ffe21b139a1f262b6505461a659397999db1d7a6cef8166a306
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/net-misc/usbip/usbip-3.19.ebuild b/net-misc/usbip/usbip-3.19.ebuild
index b2df8e2613cf..dd1e0ccb381a 100644
--- a/net-misc/usbip/usbip-3.19.ebuild
+++ b/net-misc/usbip/usbip-3.19.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 ETYPE="sources"
 K_NOUSENAME=1
-inherit autotools eutils kernel-2
+inherit autotools eutils kernel-2 ltprune
 
 DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
 HOMEPAGE="https://www.kernel.org/"
diff --git a/net-misc/usbip/usbip-4.13.ebuild b/net-misc/usbip/usbip-4.13.ebuild
index 93bbe26b7c77..bfb8473198b7 100644
--- a/net-misc/usbip/usbip-4.13.ebuild
+++ b/net-misc/usbip/usbip-4.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 ETYPE="sources"
 K_NOUSENAME=1
-inherit autotools eutils kernel-2
+inherit autotools eutils kernel-2 ltprune
 
 DESCRIPTION="Userspace utilities for a general USB device sharing system over IP networks"
 HOMEPAGE="https://www.kernel.org/"
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 9a9d5dfad050..fe7776167d7a 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,5 +1,6 @@
 AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9d29a999845be18eaa611d3162125ba4b8b7e3743406c1381c191edde2fbfb29967cf427823ce74e445ddc29b93c10ed SHA512 9fbe2c45bdda85226410020154441f25f1010e331c30a6d64eabd302c59408d2097238412f4b75407b0bb65163b3ed7258c280b411f17e4b071c95c27b0b2095
 AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312
+AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d
 DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
-EBUILD vinagre-3.22.0-r3.ebuild 1649 BLAKE2B 879c8af71284485da26297599f484fcf84395a3836b6c0409ed39144bc98f1b02abdf5b6758f91b2241647a6eee23c0ab4c86bb92b6988e81bb6fbe56abb0440 SHA512 90ecf342cd46f26ee8d655f4a77877711547e841b8a37b94bfe17b2256f184dac30b18cda90789a0e6569c9eec92298c5039e8cb65599347bf7ec931645b3eea
+EBUILD vinagre-3.22.0-r3.ebuild 1767 BLAKE2B 25c5a6267b4f08cbe60aa58693074e57bce9022fb01e06bdc7e7bf60bab79cf74c7fd3cf38e0b2af84833174917964da9cdd56862a29980dcd6aa67d5f40005e SHA512 dfcb08bbe6b39a8c2ed8e35538e365721f93589dd30e14e374e0b5811beea4fa2c1b25ab9c9e62e73f15e213537587f398969b8a9d0a25966e75a7d07d7729a5
 MISC metadata.xml 550 BLAKE2B 6f81c1e289dfcf1839030e45752fb4970ea84b3f8f8d187ae476f4fdbbce15739b8a5857b87bd4b426936f90554a9346f7abf3b9c60624fb39af4f6e2fab1b98 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840
diff --git a/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch
new file mode 100644
index 000000000000..d23ce4fa59f6
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-3.22.0-gcc10-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/plugins/vnc/vinagre-vnc-connection.c
++++ b/plugins/vnc/vinagre-vnc-connection.c
+@@ -27,6 +27,8 @@
+ #include "vinagre-vnc-connection.h"
+ #include "vinagre-vala.h"
+ 
++gboolean scaling_command_line;
++
+ struct _VinagreVncConnectionPrivate
+ {
+   gchar    *desktop_name;
+--- a/plugins/vnc/vinagre-vnc-connection.h
++++ b/plugins/vnc/vinagre-vnc-connection.h
+@@ -26,7 +26,7 @@
+ 
+ G_BEGIN_DECLS
+ 
+-gboolean scaling_command_line;
++extern gboolean scaling_command_line;
+ 
+ #define VINAGRE_TYPE_VNC_CONNECTION             (vinagre_vnc_connection_get_type ())
+ #define VINAGRE_VNC_CONNECTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection))
diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
index 681c6aac3fd8..dd6c7bc9f772 100644
--- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
+++ b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,9 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=765444
 	eapply "${FILESDIR}"/${PN}-3.20.2-freerdp2.patch
 	eapply "${FILESDIR}"/${PN}-3.22.0-freerdp2-2.patch
+	# https://gitlab.gnome.org/GNOME/vinagre/merge_requests/8
+	eapply "${FILESDIR}"/${PN}-3.22.0-gcc10-fno-common.patch
+
 	vala_src_prepare
 	eautoreconf
 	gnome2_src_prepare
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 48502ade8a6c..4e1ad4864c6b 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,6 +1,12 @@
+AUX CVE-2014-6053.patch 1054 BLAKE2B 4f1b4512bc2c0d3ea971379bcbe28ceda2288f7acd041e565ad7bcd884fbca2373f5ed5e862a11d83cd6d4a222d8e75ad0fd20f4e8e867ec657a6f009cb573fd SHA512 0c3873b5a26576d13446c8b78b8737ada2f1bf9efd7af015061bfe1df694d54c741ee6d9f551abc60d8bf30e92e5ce8b40d50d12b378add5e5f9ce3a70fef8a5
+AUX CVE-2018-7225.patch 2397 BLAKE2B 2adae0915f8ab5046b80d30b9e1ad7ae923ddc01c9281d4b1ef59ff360a5408f3581e70dcca2e31e0b66179e32503d36df5e2ce4903478e06a4c7b5331676aa0 SHA512 9a9d8f8bbb96a75e96d4eb4c649e2c5e6ff3fb713b030559ba465b1267e742e0399b8f142de94d9ce2aacf9cd8403406bac247b29812559172b5b324c87b9e1c
+AUX CVE-2019-15681.patch 950 BLAKE2B 5c45bd813ef1329ebec3486fd5464df510d72f52172cd0b6ce9aeebb06685e33500df3f2e335a882067e0aa1b8db4f9307aba04879b91e4b6b04071a50e9551a SHA512 4e9e638b12970ccac3ffd85135cc93a943ec30a9d73797fda4e8403a464e6f63870b28f6f1dfa27d959a5703068cc53287112b1d4d85682edf7161b300951a61
 AUX vino-return-error-if-X11-is-no-detected.patch 1102 BLAKE2B 145b468e06bfa8b7abb18c1209761a2ca2314ffc92f04fe419ef0722eaed6a30b5a2e8cbeb8923e1b0cf072ba988ea9c3031fe2816df8632c3e123f643c70221 SHA512 6342507c051d81fbcbf8d2f8ce5005b60da0ba6a1f725c3aabb164c310b7c17a92f1aaeedc69873b47ba35041ff5ab7d75b762d5f9bfa70d967864e3cafb2596
 AUX vino-segfaults-on-wayland.patch 1172 BLAKE2B c8e3b9316309f78975123cd3ac87fd53d8fd498be5927a2188dfbddf5ac5316febf71ff5297466e95d079e9dfe8bf4a034c1b45320000c683f5e264527a870dd SHA512 e1d9a489643ce46259ebd830ccd906dbe65675ff57cb2d405b584acbf6c67e3a3f34f051c6ab5bd5fb5d40bd873225b36801b87030c30c0c764d3d5a72095f23
+DIST vino-3.22.0-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-r1.ebuild 1821 BLAKE2B 14db439bf16ef23f58c0cdfb8b5119e591a3cbca521de229ff7ebe026a05992db296908cd77b52053691984227029e7c78276b5f700b388219b653ffa450e476 SHA512 8d10fcb421ad25ec3aac15b9ed6b4e6f9aa6c54b572ac0fd5d04c30b06100b99d889807fd8f3f5844ae1a68d740042adeeca0a5212e32ad21bc83cae48bae5b8
+EBUILD vino-3.22.0-r2.ebuild 2006 BLAKE2B e624588d848c5f078ae4f025ef3e338aad712403267214a8564f04c1857be791d983baf700056e5948e5bec87e22412055c994b7299f234e9463c47eef07298b SHA512 f2ea280caa7560ff05fcead6d8720d70476b8f347deb86a26530a870ba21cd0506acea72a3c5877c341cdb415f801ccfa56be33e5ba3f404286afd66ed118ec4
+EBUILD vino-3.22.0-r3.ebuild 1956 BLAKE2B 04ca02b942477d1df887ece1e69cda37ccc1487c2eb9aa13c86eaf3bb0476ddf7a14a1a9f06c81275ed314510ec11e1cce5e566886e993fa6625b95ee21143c7 SHA512 fa0f12b45f610fd4c971316d21841f24dd7d9d80bc01810024ceef7ddb9b23c7c1915d38488a022a6eb3a5bd3fe06f7f81f19504e1bcbdcbde99933f8829badc
 EBUILD vino-3.22.0.ebuild 1641 BLAKE2B cb05d5798cb4873e688bbe0e9c11b9648ae19400973599c854a243418aa25cb8381dc7aa761c31a11c4de5b7bf750df5850fbc3c1f8d94f64fdf2b9c035b61ef SHA512 e4f75abf8c4b63f7e7c2856cc6aaf1773fde72464d6f58277a922145676db3f634625c1448479d9ebe0d8fe7d946ceef1d094679dc498ad0368f326ab6e1a883
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/files/CVE-2014-6053.patch b/net-misc/vino/files/CVE-2014-6053.patch
new file mode 100644
index 000000000000..8830c30f870d
--- /dev/null
+++ b/net-misc/vino/files/CVE-2014-6053.patch
@@ -0,0 +1,31 @@
+From b1bfadcbfd88970c6d48672e2dbcca8713c91411 Mon Sep 17 00:00:00 2001
+From: Nicolas Ruff <nruff@google.com>
+Date: Mon, 18 Aug 2014 15:16:16 +0200
+Subject: [PATCH 1/3] Check malloc() return value on client->server
+ ClientCutText message. Client can send up to 2**32-1 bytes of text, and such
+ a large allocation is likely to fail in case of high memory pressure. This
+ would in a server crash (write at address 0).
+
+---
+ server/libvncserver/rfbserver.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index a880b53..2615dc3 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -853,6 +853,11 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
+ 	msg.cct.length = Swap32IfLE(msg.cct.length);
+ 
+ 	str = (char *)malloc(msg.cct.length);
++	if (str == NULL) {
++		rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
++		rfbCloseClient(cl);
++		return;
++	}
+ 
+ 	if ((n = ReadExact(cl, str, msg.cct.length)) <= 0) {
+ 	    if (n != 0)
+-- 
+2.20.1
+
diff --git a/net-misc/vino/files/CVE-2018-7225.patch b/net-misc/vino/files/CVE-2018-7225.patch
new file mode 100644
index 000000000000..1b1186b4fe78
--- /dev/null
+++ b/net-misc/vino/files/CVE-2018-7225.patch
@@ -0,0 +1,64 @@
+From d8a663541ef358a13fed2fbb39e7d323454369dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 26 Feb 2018 13:48:00 +0100
+Subject: [PATCH 2/3] Limit client cut text length to 1 MB
+
+This patch constrains a client cut text length to 1 MB. Otherwise
+a client could make server allocate 2 GB of memory and that seems to
+be to much to classify it as a denial of service.
+
+The limit also prevents from an integer overflow followed by copying
+an uninitilized memory when processing msg.cct.length value larger
+than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg.
+
+This patch also corrects accepting length value of zero (malloc(0) is
+interpreted on differnet systems differently).
+
+CVE-2018-7225
+<https://github.com/LibVNC/libvncserver/issues/218>
+---
+ server/libvncserver/rfbserver.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 2615dc3..2224edb 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -59,6 +59,9 @@
+ #define DEBUGPROTO(x)
+ #endif
+ 
++/* PRIu32 */
++#include <inttypes.h>
++
+ rfbClientPtr pointerClient = NULL;  /* Mutex for pointer events */
+ 
+ static void rfbProcessClientProtocolVersion(rfbClientPtr cl);
+@@ -852,7 +855,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
+ 
+ 	msg.cct.length = Swap32IfLE(msg.cct.length);
+ 
+-	str = (char *)malloc(msg.cct.length);
++	/* uint32_t input is passed to malloc()'s size_t argument,
++	 * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int
++	 * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int
++	 * argument. Here we impose a limit of 1 MB so that the value fits
++	 * into all of the types to prevent from misinterpretation and thus
++	 * from accessing uninitialized memory (CVE-2018-7225) and also to
++	 * prevent from a denial-of-service by allocating to much memory in
++	 * the server. */
++	if (msg.cct.length > 1<<20) {
++	    rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n",
++		    msg.cct.length);
++	    rfbCloseClient(cl);
++	    return;
++	}
++
++	/* Allow zero-length client cut text. */
++	str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1);
+ 	if (str == NULL) {
+ 		rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
+ 		rfbCloseClient(cl);
+-- 
+2.20.1
+
diff --git a/net-misc/vino/files/CVE-2019-15681.patch b/net-misc/vino/files/CVE-2019-15681.patch
new file mode 100644
index 000000000000..31bb47ee9b27
--- /dev/null
+++ b/net-misc/vino/files/CVE-2019-15681.patch
@@ -0,0 +1,26 @@
+From d9f3fa0ede556c6a751a8ca6c8bc37e769715233 Mon Sep 17 00:00:00 2001
+From: Christian Beier <dontmind@freeshell.org>
+Date: Mon, 19 Aug 2019 22:32:25 +0200
+Subject: [PATCH 3/3] rfbserver: don't leak stack memory to the remote
+
+Thanks go to Pavel Cheremushkin of Kaspersky for reporting.
+---
+ server/libvncserver/rfbserver.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c
+index 2224edb..ca4f59b 100644
+--- a/server/libvncserver/rfbserver.c
++++ b/server/libvncserver/rfbserver.c
+@@ -1565,6 +1565,8 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len)
+     rfbServerCutTextMsg sct;
+     rfbClientIteratorPtr iterator;
+ 
++    memset((char *)&sct, 0, sizeof(sct));
++
+     iterator = rfbGetClientIterator(rfbScreen);
+     while ((cl = rfbClientIteratorNext(iterator)) != NULL) {
+         /* Client is not authenticated, ignore. See GNOME bug 678434. */
+-- 
+2.20.1
+
diff --git a/net-misc/vino/vino-3.22.0-r2.ebuild b/net-misc/vino/vino-3.22.0-r2.ebuild
new file mode 100644
index 000000000000..bb0874d055d7
--- /dev/null
+++ b/net-misc/vino/vino-3.22.0-r2.ebuild
@@ -0,0 +1,76 @@
+# 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
+	virtual/pkgconfig
+"
+# libsecret is always required at build time per bug 322763
+
+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/vino/vino-3.22.0-r3.ebuild b/net-misc/vino/vino-3.22.0-r3.ebuild
new file mode 100644
index 000000000000..b53f4ca1bcb7
--- /dev/null
+++ b/net-misc/vino/vino-3.22.0-r3.ebuild
@@ -0,0 +1,75 @@
+# 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 +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:= )
+	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
+	virtual/pkgconfig
+"
+# libsecret is always required at build time per bug 322763
+
+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/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
index 76cf1308ec3a..a199e6985e84 100644
--- a/net-misc/vncsnapshot/Manifest
+++ b/net-misc/vncsnapshot/Manifest
@@ -1,4 +1,4 @@
 AUX vncsnapshot-1.2a-amd64grey.patch 408 BLAKE2B 4d48218067db7ebba1c9effecc0a1328dd6d49f2dcb3f5b666c27a7a3986a425d18a9abbec8abc24b446d1f3be66bdb4198d77083f98f921875f1cf9d0630bdd SHA512 b5a90a5917c71f5d30608bfa8316ac052b377e024d871754fefc7f1fa13e29eb49be587b5c99d65e9058c65a914120c646194bb25ad114220a439642f3e24ea9
 DIST vncsnapshot-1.2a-src.tar.bz2 70121 BLAKE2B 91e2d1e998f102707e00e5e83e9060fa88f1140b64029564977b93ac5b701be3408540ef76addf4ddf2cccfa973c59f94a127c74f44143c3683e38b0e9359c6d SHA512 2ae53a043c11d02bbb7ff6afc000eef268448643ba1db7b6c5a55fe3e25e65e1b22e64e855d33dfe55b1df04dc57f592e48c44918943642da19f7d06df77027c
-EBUILD vncsnapshot-1.2a.ebuild 988 BLAKE2B 0b282c94000fd0d383170b74288e90504f2504af9bb5b05d2c3a5a5b35e55067538515f5d51784a8534065f790d98966878540706cc916a7f9f34e0a6b87943f SHA512 d6c54dcc970320faa1535d2c93be4c12c50b3f66cb8f18eaf83912fb4ed2c0a44d2b50e5e70517257e81ec45b1ebf0c6cf0790c9397dab07798d3d3bdb4b239d
+EBUILD vncsnapshot-1.2a.ebuild 1001 BLAKE2B 78e4da23b4742f6bb9514d5e61bc9f3b4fecede035c8d08196e3b8ecd3ccaeec4f602c38fdab7b571e3d973044a016a99b1925153c4baa4ec25bdea53fbefe61 SHA512 1c55e5b579eb00e45b0bf93b7b101f945b0b1b7df609cff5aedebd8671ca2df0e13b49a6fb3a86b2684240fd5fa1d7fb5fb84ab56584f8ec734716e97471d4fd
 MISC metadata.xml 248 BLAKE2B 28a5e2c7f4227ef05251fe01d656fded49975e8173cf4e1fafafcee38306fd6a79485b71cfa227fe92cac85267616cdf7f052ded4aa78c08bcce0a5d56c68524 SHA512 bbd64700d2397ca9fd98cd273404e7a3d744d7aea1e2c7237e5d157786966841c7156d716b47da9cb46dbc248c25e2aa9dcf1be44f0583e50cdc9c1b253de799
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
index 11ea46fa1db4..221b1344f245 100644
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
 HOMEPAGE="http://vncsnapshot.sourceforge.net/"
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 179d660ede25..fe2709df405b 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -3,7 +3,7 @@ AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82
 DIST whois-5.5.5.tar.gz 103424 BLAKE2B ef406985be6ca6fe1d73e5c23817c99aa1c111f9ec74707f96602e53e519b77585fc27feaf11baf0cfc4f1fa94fbd876fd6631ea0a4c2b3d7b4bcd99cfd2e786 SHA512 0fcdd5b7fbdf4123edda2af58a2fcf0a1a87c454dc6cb83c86c1d200f80659967a7d08d54d3b010c40465004aa219de2a8efcc4b41524a8aefc2e6050d868d1b
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 DIST whois_5.5.3.tar.xz 85456 BLAKE2B fb64150ef2a3c40c7e9b7467198f1187b07d7b0a75e7f89f36a613cd9480016434a187607f93c102142f2f82cba405f5b0a7b16314f1b13aea793da6eb3b9ade SHA512 cf92c17b9187da1fb5ef38d3e814cb5590fc9bcb5c8f53640428cb7680fd003ce71d8a6819279b571138da1b31042b65eb1dac5d3b220ab725d191958c4ba47b
-EBUILD whois-5.4.3.ebuild 1574 BLAKE2B 5f9e28b7f3b4dd59a89525f118b6fe0d1ee5ff273829ab5bbc7747e3276ea65bf689fcc6afa581ecfa3e402d2946e8b170b6718b705f7f07a1fe0ad2bb6f2fee SHA512 4a73230547ee6c735e055a01276a80e2712d681e2061d322e4531685d7ec4074facb49248caf515688deacf1c9fc8155a074ad191e05ea0e8ce364faec8d6222
+EBUILD whois-5.4.3.ebuild 1574 BLAKE2B 95a98d315c975ca42f98f0ba09f39e5002f46f1c6bd6024fc78dd2bffe8cd422afb0f2d2e735ed10d69f77f5d575c946e273be69d59f8a78ee0503c86f41a2e7 SHA512 e1be4caba92dd2bcc92238a158d941adc733686bac889c2a5cc578c0e9d99faa4caee097ec2ba4f8b44f7374075312d400a7c3dad9179f0913690ffd022c51e7
 EBUILD whois-5.5.3.ebuild 1802 BLAKE2B 279625a4d204dc2544fcb48101184872927bc62b006f3fc6dd95741849cd83ceafa61c8df9b9eff12e9335944de820762c3ac267bcb7fbf796cbb4f14c9f8c67 SHA512 2ce870c80ec1cef69657609b0bcbd930d290506a631a157cfee5f58921caff808d4561a4ea2e560117cfe14b6bfa49aba18e03c991c5e1f07f38d46a6c609196
 EBUILD whois-5.5.5.ebuild 1803 BLAKE2B 18abf8ebc9dc0b9e47d911344cd64876aae9bd0c88a22bc40489759824116c42510e65c1f698513ecdf048eef7bb58a841e949083aaae55b4adae1dfd9ddf268 SHA512 c8ea7771d38c1e138899fbf1859d33b8fa2d448306403ad2561c940b4dfefbb20dd2555ed38780187beec2ead11c6e118e87aee01aa667e5cada372610cee3bc
 EBUILD whois-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
diff --git a/net-misc/whois/whois-5.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild
index d9dc140da2b6..08d0eda40315 100644
--- a/net-misc/whois/whois-5.4.3.ebuild
+++ b/net-misc/whois/whois-5.4.3.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
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index f0838094513b..f66a273e5faf 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
-EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 978 BLAKE2B aa489ad8d048515b793efd2d9fae9963d19a614f841450d7f8ddd99d041bec2afb88a681efb57290718663aecac6fd16a77cd67ed35f5325b70cbde16f323d49 SHA512 3837904c03cbea195e5067c422e53361cdb0897b4c69e808afef8aaacd1ff22abc46783d14396d451b64328885ff122c1befea99997334887b9ed571957730a6
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 978 BLAKE2B 29d270060865c0a3fb95d214836e4b8eb338c8e3aed13edbc4e711ce07a72fc25ba1f6c9fd334d09e922969ec17ee94dc43d3db3e170ce0b549599df3533217b SHA512 e1550015d511e4b0c2b84850908452225eb44b7da0147f8bf69fcf0eaef8188f40df4d6c65cc91f4680344cc9e05d8ee83f7237d1f72cc8e3f12fa4f811a3ecc
 MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
index 89c37e3a1f11..63844cfe043c 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -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
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 7ee897cab4b2..70e173daf580 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -2,6 +2,6 @@ DIST you-get-0.4.1270.tar.gz 143127 BLAKE2B 2c18a97001caf0c44a5baf30042cde61ac0a
 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 487 BLAKE2B 68d6ff31cfe1e0ba3b82d91da90f1f7a9964176d89609a5415eba9b0f077e1242699c7be323d7c7c9c9019c6af7834e57fa3457b7cbeb14eca00fef36a1a7758 SHA512 9127d26de19919d6803ebe344c47ef2e86ae49799185a1a210424724d406a3d78e987fa63a656f086efafe0ae41730905c826c818a0562a1dc63477fe72ff019
+EBUILD you-get-0.4.1355.ebuild 485 BLAKE2B 7066187af2b085ffb7560dffe9468373b59e36b10cdbab1f62d140023bac42b2febb78d16777477c67007b9a373952c74cb64112b88b9e3c289da89243add485 SHA512 d18aa4ca6724c5a8ecccd70f5b48fae85a958d1139d1199df30c21f65384f14a118ce7d9cdd65b2b5cf25731c68974f245c5998d47dde27b536f3303882c7758
 EBUILD you-get-0.4.536.ebuild 479 BLAKE2B 8cff0bd50d7ecc90be4fd627a2bfe55733a5fe12a24b7b72ddd163fd0ea933d2eebeac25545e6b294eda229b9b7e77336fb4294beb0dff02114ceadb8d210604 SHA512 7b783e4dd9759f43b433423cec7950f7aee06cac32208339a50c06c260a3a14ba7e872841fbe0f589b381849508ebcd635c02bece270d597393c918556a33a8a
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1355.ebuild b/net-misc/you-get/you-get-0.4.1355.ebuild
index 901c4ba7be15..4dbfac016357 100644
--- a/net-misc/you-get/you-get-0.4.1355.ebuild
+++ b/net-misc/you-get/you-get-0.4.1355.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index be16c9f96870..660f7040f5e2 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2020.01.24.tar.gz 3159926 BLAKE2B 0b1be74f74eb0be6cb0a41faf0538110bfc5d1a213fa1c456a6a358096f16ac8768ebd3d4673e523251fd0721a4a0990f061713d32b13c11077e79f8f02989e1 SHA512 8f85a218395d2932b26c7b76d5b03cbdf9a7c541415c8d1b805239b6ab1ca74b94fc497f32052a1d93fe20ac760994975a13551dd8c5319f0549af20b70a1a78
-EBUILD youtube-dl-2020.01.24.ebuild 2266 BLAKE2B 8d67b5a5d8c4ab5aad38235b4fbdb6207ae254f5e6188b56a3690f07dd93b9465e6ce29b4fcb2db09cd49dfbae0b0669fe01653a4587370628fbc522e3924e83 SHA512 e5bbe041d01746a4457fdaa7304dba47c27335db8c5dcaa92d58d28b4aed2a057efd61cf19275c856b38df0777553d95f3265b19d42fc01b4bd395d48ff34c86
-EBUILD youtube-dl-99999999.ebuild 2169 BLAKE2B 03625066470b3ac087db63562323364a152210c03a834740eacef65165d570f09571327428efd5a9c343f3ff0cc1b569dce2d4e1219baacf7a8f48d9fbd56dd7 SHA512 cdb1342825ac3a6a1d7c3235b05bfc98e35e5e6ce0697f094e54790e985b846aa23303d5b3d1fcf6b9acf6503f0ff290e0185c22083ba193c9c14e7bd8541972
+DIST youtube-dl-2020.02.16.tar.gz 3161956 BLAKE2B 36cd189b162d98f986d669c4439070efbf344aa05f821b9e35a58fcef8db839ad0e079836e7a84cd17b04afdb113559695ad500f4b0183c7dcefa1694bdccf62 SHA512 1164ad9f875d67844ddc7bf8214bcc06cb384d7f2a5661c1f419f2ce5950b1cfcbf90c558e143b76948d9d7cf57cf3843c8d6392fc6ef77f89319375610f01a2
+EBUILD youtube-dl-2020.01.24.ebuild 2260 BLAKE2B a48928c4a0252d63ca1298ada873980ddf65232bd3e701b967d897cc27164ac984db30d6751e993690c90b508f6578f0de616edb89a0bc86afea52b7222d770a SHA512 1a46d92d493004b2341d429c83d20b39815682e9163525132acbe5ca7ecce3b02555d0723695f83abd5443204083a5a23d0510a82340c441e67d360a24c4d300
+EBUILD youtube-dl-2020.02.16.ebuild 2266 BLAKE2B fe492271e4383198eb2654a2085c297120dc09f9ae6242cc65bacb2b98422ddb371e5ff68f3620370faedaab9566e786c46e740c93fa7538c742188c4959e329 SHA512 a3cfd6f92f2b66ed7ed90feaa3563402fbca898f1918d7b0804512da81fa47db69cbad7e8cef06178e4f5f7ac1db5889ab75d8b0abe501c6d5b94d521466f4cc
+EBUILD youtube-dl-99999999.ebuild 2163 BLAKE2B 29e69318bbbb79c7e311867c0be98bff4f3958c8df7723c28b0917b8cb3c8f8a922dd1cd1f83853423a19b3f62e4e26255e8a26a5e6e0c55ec8b44fd5dd6157b SHA512 096da09988640a41943c7af34f52a4953e9e175452b390b5956c324f61a6161db5004cf8d70f8ff34d83b29513eee7709df8335aff82b5a3413ed48c4af6f76c
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild b/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild
index adda709feb33..b90fc3a70b10 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.01.24.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7,8}})
+PYTHON_COMPAT=(python3_{6,7,8})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
diff --git a/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild b/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild
new file mode 100644
index 000000000000..cc4f38a726e5
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.02.16.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{6,7,8})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need 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
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 73d8ad3455b8..3135d5cb48e0 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7,8}})
+PYTHON_COMPAT=(python3_{6,7,8})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-17 01:16:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-17 01:16:38 +0000
commit	53cba99042fa967e2a93da9f8db806fe2d035543 (patch)
tree	9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /net-misc
parent	71deace00d1a2b091313fe137ab7092418c6f87c (diff)