gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /net-misc
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
124 files changed, 1703 insertions, 3357 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a05040d63c69..55a18243aeb5 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aget/Manifest b/net-misc/aget/Manifest
index 06c866b155d4..d7728be715ae 100644
--- a/net-misc/aget/Manifest
+++ b/net-misc/aget/Manifest
@@ -1,4 +1,5 @@
-AUX aget-0.4.1-r1.patch 2423 BLAKE2B 26c1af35a30931d4c67323a636f4326426efe114cd62ef8ba344c59cc72a1581247483f9f80c3b6ea3d17695f752216d25ebd2983c19585c3e78a27b8f8b7cb2 SHA512 b4c1765634f6f14c19e992fa090b7ed1ec11a5d62fe874602f18466d3ced9c0a2ec255fdb8dcb732f0fbd9be9831fe080509992c86fa7b8f11f40366a523ae28
+AUX aget-0.4.1-fno-common.patch 1190 BLAKE2B c7482ccdb919bf16433bf1e22850931455d323cb0c50a5b684c93ed77e26fb1d81f048a64519c2c21e4be41cd3637cfb0603c86c2075c7d1c6e9dbb2a5824387 SHA512 0473951d51448811f1a34fecf4542251d2c02c57c5000a96aca2bde2cfbc16647d6075909a1941a4a6a28550eb288958a92d1a14a0959511b60065eae18efa1b
+AUX aget-0.4.1-overflow.patch 2351 BLAKE2B 549acde7d70ba5d45daf9712eba839c627f8c692be7f5821c2c677db3bec88dc939e0059f1423fc26bd7475536eac3ee2e65e0a6d12d5011fdb57ca4e21fdc6a SHA512 b578553bebf948a606f12e72a2a0b512bb540c14bce030825daa92ecb7af691a504b4f5f1bd1a1e930b2a332b6a15774f8ae0204e46a20b8c6712158c88de5c5
 DIST aget-0.4.1.tar.gz 12783 BLAKE2B e1716f85fe426a8b5c049d54a0c63ae2ec050ceafe8b7f67a36be23a2750782a96939e82ab53485fd646c078cdc5c64445340d0557b9a5656fdd4378aecc29a8 SHA512 23fd4a7786b905bb10fb8de62dea294e014e0c2ad276614c642ebd3865b262eb88e08308df9a68f418de19a984ad138561d82c67e0226dfb5f56520e8ed15ad7
-EBUILD aget-0.4.1-r2.ebuild 582 BLAKE2B d1f522198c0949e4346b97135e4ffecf8117933929859707649a771bcf6a4a2ff9d987cc9ab939a665c393a6ba2b65eeba00c241941176a037563edadfde75f2 SHA512 1f6f40bbdfae1eafdbb06de955bfdef4031c78457b06c6ee5c553b7792e9794b00efc350f20122dac1714afbf7f6c97a85a2dd068a03bbc3ea8bc31612551827
+EBUILD aget-0.4.1-r2.ebuild 516 BLAKE2B bc003db536e15c751667f22c5ea854939d6af5927b574aa6b79f92e4e89a1ee2d316a116e7b644d37b094e65abe76e4cddde2968b138200436f265079b50f2a1 SHA512 98bcda8a751897d85cded8191efba96028db0d249a476f9eda9c8e3a622cea6b413f22fed0a0fd03657c77ab2bfb8d00fa6f15144232d2775e6c2b133b0d2f3c
 MISC metadata.xml 686 BLAKE2B 214778867fe490fb2b87a3785cfc71d51de5d8d0228c80c5d3e544fd120a545b042ac0e2e25c981d67f68243beb766f0fbf1a3c40a74e214c7cc22a2151482ad SHA512 5dc261567f8a6d575f9622995bda903d2d10279473aaaca4c9e4df2a2a58074a2dd7b8239437a6fb0532cbb2af3a0cd6450659aaa76446ff7df1604e6761ca32
diff --git a/net-misc/aget/aget-0.4.1-r2.ebuild b/net-misc/aget/aget-0.4.1-r2.ebuild
index ed4438eb35fd..98c7c8837fa9 100644
--- a/net-misc/aget/aget-0.4.1-r2.ebuild
+++ b/net-misc/aget/aget-0.4.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,17 +12,12 @@ SRC_URI="http://www.enderunix.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 PATCHES=(
-	"${FILESDIR}"/aget-0.4.1-r1.patch
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc AUTHORS ChangeLog README* THANKS TODO
-}
diff --git a/net-misc/aget/files/aget-0.4.1-fno-common.patch b/net-misc/aget/files/aget-0.4.1-fno-common.patch
new file mode 100644
index 000000000000..e881cc39b88b
--- /dev/null
+++ b/net-misc/aget/files/aget-0.4.1-fno-common.patch
@@ -0,0 +1,66 @@
+--- a/Aget.c
++++ b/Aget.c
+@@ -33,6 +33,8 @@ extern pthread_t hthread;
+ #include <errno.h>
+ extern int errno;
+ 
++extern time_t  t_start, t_finish;
++
+ 
+ void get(struct request *req)
+ {
+--- a/Head.c
++++ b/Head.c
+@@ -34,6 +34,8 @@
+ extern int errno;
+ extern int h_errno;
+ 
++time_t  t_start, t_finish;
++
+ #ifdef SOLARIS
+ extern const char *hstrerror(int);
+ #endif
+--- a/Misc.h
++++ b/Misc.h
+@@ -24,7 +24,7 @@ void Log(char *, ...);				/* Log 						*/
+ void updateProgressBar(float, float);
+ void handleHttpRetcode(char *);
+ 
+-time_t  t_start, t_finish;
++extern time_t  t_start, t_finish;
+ 
+ #endif
+ 
+--- a/Signal.c
++++ b/Signal.c
+@@ -16,6 +16,8 @@ extern struct request *req;
+ extern int bwritten;
+ extern pthread_mutex_t bwritten_mutex;
+ 
++sigset_t signal_set;
++
+ void * signal_waiter(void *arg)
+ {
+ 	int signal;
+--- a/Signal.h
++++ b/Signal.h
+@@ -4,7 +4,7 @@
+ #include <signal.h>
+ #include <pthread.h>
+ 
+-sigset_t signal_set;
++extern sigset_t signal_set;
+ 
+ void * signal_waiter(void *arg);
+ void sigint_handler(void);
+--- a/main.c
++++ b/main.c
+@@ -15,6 +15,8 @@
+ #include "main.h"
+ #include <errno.h>
+ 
++extern sigset_t signal_set;
++
+ int main(int argc, char **argv)
+ {
+ 	extern char *optarg;
diff --git a/net-misc/aget/files/aget-0.4.1-r1.patch b/net-misc/aget/files/aget-0.4.1-overflow.patch
index fe804901528c..998dc128e3dd 100644
--- a/net-misc/aget/files/aget-0.4.1-r1.patch
+++ b/net-misc/aget/files/aget-0.4.1-overflow.patch
@@ -37,8 +37,8 @@ than setting GETRECVSIZ bytes to the value of 0. By Kevin Pyle.
  		dr = recv(sd, rbuf, GETRECVSIZ, 0);
  		if ((td->offset + dr) > foffset)
  			dw = pwrite(td->fd, rbuf, foffset - td->offset, td->offset);
---- aget-0.4.1/Head.c	2010-09-20 03:41:27.236019179 +0200
-+++ aget-0.4.1/Head.c	2010-09-20 03:43:00.087098655 +0200
+--- aget-0.4.1/Head.c
++++ aget-0.4.1/Head.c
 @@ -1,5 +1,4 @@
  #ifndef SOLARIS
 -#define _XOPEN_SOURCE 500
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index e4a4c0f158fd..2fd2be012d54 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,5 +1,4 @@
 AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b74657531b9484664aae2869f6dfef3ff71cf64a3fa91e90c4fdbb275a8038751fff4087129e67f63b11b81a436e459b7 SHA512 8d661424838fd9500512290785a56af4364717df87d3423ab8dc3039affd1a26fa7aae6afe2ca4fe1ce668a0172b07a96f4cc9a73eced95f25d5848f3a3f2624
-AUX asterisk-13.33.0-nossl.patch 3176 BLAKE2B 1c225d3a4256e6bb69bac025adf3f21aec806cc864e55fcd1381244b68ef8a8d82d462d548a32dc9e1cec3b94f508bad09fbc3bd8602230fa79a916e6dededa5 SHA512 895e6bd770701fe25c389447f5a4454e9d5ead183c44fcc76c623f0140af1fac72ba12ad8331f7ef43ff926dbf3470646c99af93cf5f83cc70f9432ab1604e29
 AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f964da0756698134ce9127a3ae854e19ccec098fb554f4835cbb1698da6ac76293dcb1af3dfd8ea741e9450d58b61c7da440ff3077c848dae68 SHA512 dae3daad5a6755a8a932b40c5d209c348a72266c139a2e05420ea4b8f292062832cf791bc8d41de4bf8c1e0516e8699efdb80724a5afb2d017ab707073d7fca8
 AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
@@ -8,25 +7,11 @@ AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d77
 AUX asterisk.tmpfiles.conf 88 BLAKE2B 3c32a8dd17b94d607407a7b201448be69c72f1cbe2c414a72e2e2a49436160edcd79b370df6cd830d37d713ee0083e11b92b8053a7822645db960af9fe97ba2f SHA512 a3bdc4608f8fa9e71c2ba398e7a12ed91b7f6c6eb52c96daa86133d382bd08e84d8dd5c1749baa0d1c9c6c5fca9be7aa932eb946d188869294af5b7062ed7a23
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
-DIST asterisk-13.34.0.tar.gz 33686020 BLAKE2B 48de77f2e29028ab3503ea30038e629b6ede43154bec8efe1384a7077fb971f91b85d9b4eb55f7a4ea6577a31ad5fe496453fe59cd607a0c613e46edef9a11d9 SHA512 2132db831bb063330c47cea8cea67af706839d25e64eee558475643cb79a4e548fc6ffe7ce61a053f41cf6f367320eedaa87973a5de4ef38ae858a6e5a183ee7
-DIST asterisk-13.35.0.tar.gz 33685340 BLAKE2B 728281257541977ac150b1b7d6148fd326c584f7827af46882ff3e3af111d876c3e53f92f1034c55875d730e5b92c379b8906198393b7a4227a5bb74818ab27c SHA512 7596f387d45ef9f0327d78bc0446979e233aba517bbedfb539409cc507e2dac15e3b32d5c8a5e69783d106d4244661cb20b0580ed00904699bc5bf5db7b4713a
-DIST asterisk-13.36.0.tar.gz 33692378 BLAKE2B 7252e7a103d94bbdd4073563f88ec2952ef88856cb5a98f7a07818a993c1064ca4ffb12202f2c297125d7bc3fd3814c9921a87c179db03dede05162844bebbd1 SHA512 276175e6df1c8a2e642c4607aa32515e7c4fffe50f7db89bbfee8850b286579350a074bb8bbe743b3e95d6ce2d92f8d5444053fe52527071cc884356b57a1efc
-DIST asterisk-13.37.0.tar.gz 33696267 BLAKE2B 806e48fd2ed497becef87e5a349854e377aaaeb5f749e4c8ce957b585256edcc3c1812f199f793eecc829155baf12336f4971d2664e836ad38248139f5fc719f SHA512 f01ebc3a0b4d598f35f26e60aa6fdc03ab5d4ee28547ec048c2af9ab67f2657a5767484bf7d07d8fbcb1e84ce6865f4fe70772f30a5dc45568669ffeb7387b8e
 DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
-DIST asterisk-16.12.0.tar.gz 27727347 BLAKE2B 3e2e986136e5ff19a876f01fdc6db1b6c22f83bf38f8524a418e474e2400375d8091dd215fb54f5b01f998cecf46d6965a0c35a44dc6f3be7f7a811e2ce70b8c SHA512 1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891
-DIST asterisk-16.13.0.tar.gz 27735450 BLAKE2B 64cc75c7aa715734ebaf06fe7b3df54cfa309fc6126b45abfc21cc22c2c4e795946be473ce2887dc074124f9da6c8937d1bb4207fecf402eed7803ed063faa80 SHA512 872c5a5cb8faf9b1632895dafb6ee86c87e1766c9f33099b32216e6703f063800f87cac6db3537d1744349c42abd3ea83d70afe35138e45fb756872688822dfa
-DIST asterisk-16.14.0.tar.gz 27740877 BLAKE2B f8a09d39c36c1cdcc17878f1af69da7691503290177583ec1a92ac0471c029e527a3b62bd731a7340c43fb7abeca32b604303f0739e614c5a1edb0131f07e0fd SHA512 699b0c701a00df0ffcb7094f5cc732b645775deb85486e044685685b81aad09e6b2e9558436e80c505de93add630b76cf49d7261ba8eaae46f93272844346234
 DIST asterisk-16.15.1.tar.gz 27796648 BLAKE2B 4daa0b121a789d0384d81c3b56951bfd7c919cae3de1d7eaa0ba50f01f428c1d56555838f9ce2b3fe24309b131310c59622ed114cd4f76ac7b06896ceb3da6fc SHA512 5ce6e1301825b142859087ba237b2c1b3e0687cac3fac28f35b043727cac26583697534b2726a65510e50ef27cf373b0c4cef60042f789aa6b875448a5f08914
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
-EBUILD asterisk-13.34.0.ebuild 9115 BLAKE2B 700712cc94fbf23b4d75cfec564ed72597b492192343faa39d08fb5063d1e798a1995cdf6606a01201ef99553e003988333554364a60a01b80fd0c47b20775c7 SHA512 8ab0c0dbab33194ece3355d90a7552ceed2da00a1ce072d9229d765f763e36b1da193361f3be5abde9223c0b067626c3b84444eca0006a59fb968cdc7bb4cb62
-EBUILD asterisk-13.35.0.ebuild 9186 BLAKE2B 933de7a389ff20b6f71b6b8a4eed6943a5a26217f744ac70b6b00394f4684e4eb8a7182095c05a094513fde4c65f0961a5512766ef41cf511e1fa95e47fd36a3 SHA512 5bf2dcb1ca6d14783b5745a2718466da783900ce923699a137d0ebe1ba99ca3aa424ae7f90013d2119861914dac2b41695825e3bb55520575fb8fb74e54f33e7
-EBUILD asterisk-13.36.0.ebuild 9184 BLAKE2B 7a91118e4d0abbca316d7cfeb22b458dbde3d7311efc82ced7bdc082a3f44d62df207251aca41a2be878e817db6ea879fc53e73b55c49202c8fa007e7637ba03 SHA512 2fbe03f264440b50a73d052bc45394d65fc32ee3e717387cb5e2c96b24cd3f72d15dcd5d3ee0ae2ce6625e486898030c95d43791de1b254eec4fd7458f07a8bb
-EBUILD asterisk-13.37.0.ebuild 9186 BLAKE2B 933de7a389ff20b6f71b6b8a4eed6943a5a26217f744ac70b6b00394f4684e4eb8a7182095c05a094513fde4c65f0961a5512766ef41cf511e1fa95e47fd36a3 SHA512 5bf2dcb1ca6d14783b5745a2718466da783900ce923699a137d0ebe1ba99ca3aa424ae7f90013d2119861914dac2b41695825e3bb55520575fb8fb74e54f33e7
 EBUILD asterisk-13.38.1-r1.ebuild 9456 BLAKE2B dcb95d4a66e3a79ec8493ca92103cba49f87d4a355208cb92602d8d16d81d37fb9d5d6225ad067dfff3eba475f00c7322024d986c12db77967e676a9fa32ede7 SHA512 9c8f127f40b7d87e9721e67d04c7be55101c1bcffcecddf98072cb3eb45e250af74421cbc65565fc70fd71158b9850ec4e2b22485a09842d186bcb6d2432141d
-EBUILD asterisk-13.38.1.ebuild 9186 BLAKE2B 933de7a389ff20b6f71b6b8a4eed6943a5a26217f744ac70b6b00394f4684e4eb8a7182095c05a094513fde4c65f0961a5512766ef41cf511e1fa95e47fd36a3 SHA512 5bf2dcb1ca6d14783b5745a2718466da783900ce923699a137d0ebe1ba99ca3aa424ae7f90013d2119861914dac2b41695825e3bb55520575fb8fb74e54f33e7
-EBUILD asterisk-16.12.0-r1.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
-EBUILD asterisk-16.13.0.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
-EBUILD asterisk-16.14.0.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
+EBUILD asterisk-13.38.1.ebuild 9184 BLAKE2B da7b6e6754a5825d1960346d779820aace4450232a728890ef9555e637fb27d5e20312fdef9b0288b09544d3b669636aadf1dfb64f46040435ce64a1029c1538 SHA512 1f9b49e36fccdc32f80f9018e1c5e3c89dd10dc1ca89647fb0c148e0b66286f9bd01484f54290cfc9aa14da4b35ed36c41d2e691e84af9138311322ff60e7c3f
 EBUILD asterisk-16.15.1-r1.ebuild 9633 BLAKE2B 5a6dd460244d81b83f943c982008f79071685a547140d9bf1abed4f0b845ee9a416cb510f9d8c5e9b80fa7d1b351a6cfa2cd087672aafc5d552dd78c542268ce SHA512 74187eff38dff704c9f3de4b7a3f82f054b0c90c2aad6882acd8f227840663f7bc97c8845fcdd1301ddee22328e437004554c6c03bafdfa8a911267ec4009e4c
 EBUILD asterisk-16.15.1.ebuild 9363 BLAKE2B beb1386217856dd1f215ff7ba9ea0dedfede09cea00abfff509703fd66dd924f5b2ce0ce8549dea3fdd3ae5349cad2ffde9fc5a110663b3682e6cf9dd24b608a SHA512 cf2bca2b143231e8875ee2a28465c7e3eeefe0d63436d8252fa5246799831ef66faad2c1e82250b5d00864364c78d6e977eb455c79d5a0351104375f59db10d1
 MISC metadata.xml 1212 BLAKE2B c9ad06a8991f05ba0355febe14ad4dfef9bd2d5b03327b90958c3164f5baaa1d9ff8458075dbc4270e7f4e09e806a4dd54b4d64ce4defd9883159ed56a616d27 SHA512 082b14c964a23b9616d73358b50af8644c05a5ebd86337719146b996cfdc1594d2871bc67d7b353c34687eee64706b9511efcad0ef4003e8a76d509d89b3cdd1
diff --git a/net-misc/asterisk/asterisk-13.34.0.ebuild b/net-misc/asterisk/asterisk-13.34.0.ebuild
deleted file mode 100644
index f24978bc7634..000000000000
--- a/net-misc/asterisk/asterisk-13.34.0.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-	"${FILESDIR}/${PN}-13.33.0-nossl.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vorbis? ( media-libs/libvorbis )
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-function menuselect() {
-	menuselect/menuselect "$@" || die "menuselect $* failed."
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISE_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	menuselect --disable chan_misdn menuselect.makeopts
-	menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	menuselect --enable smsq menuselect.makeopts
-	menuselect --enable streamplayer menuselect.makeopts
-	menuselect --enable aelparse menuselect.makeopts
-	menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	menuselect --enable chan_mgcp menuselect.makeopts
-	menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	menuselect --enable pbx_dundi menuselect.makeopts
-	menuselect --enable func_aes menuselect.makeopts
-	menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	use_select alsa         chan_alsa
-	use_select bluetooth    chan_mobile
-	use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	use_select cluster      res_corosync
-	use_select curl         func_curl res_config_curl res_curl
-	use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	use_select freetds      {cdr,cel}_tds
-	use_select gtalk        chan_motif
-	use_select http         res_http_post
-	use_select iconv        func_iconv
-	use_select ilbc         codec_ilbc format_ilbc
-	use_select ldap         res_config_ldap
-	use_select lua          pbx_lua
-	use_select mysql        app_mysql cdr_mysql res_config_mysql
-	use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	use_select oss          chan_oss
-	use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	use_select radius       {cdr,cel}_radius
-	use_select snmp         res_snmp
-	use_select span         res_fax_spandsp
-	use_select speex        {codec,func}_speex
-	use_select srtp         res_srtp
-	use_select statsd       res_statsd res_{endpoint,chan}_stats
-	use_select syslog       cdr_syslog
-	use_select vorbis       format_ogg_vorbis
-	use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.35.0.ebuild b/net-misc/asterisk/asterisk-13.35.0.ebuild
deleted file mode 100644
index 847f1d498afe..000000000000
--- a/net-misc/asterisk/asterisk-13.35.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISE_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.36.0.ebuild b/net-misc/asterisk/asterisk-13.36.0.ebuild
deleted file mode 100644
index c34a89ba8f6e..000000000000
--- a/net-misc/asterisk/asterisk-13.36.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISE_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.37.0.ebuild b/net-misc/asterisk/asterisk-13.37.0.ebuild
deleted file mode 100644
index 847f1d498afe..000000000000
--- a/net-misc/asterisk/asterisk-13.37.0.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	dev-libs/jansson
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( net-libs/pjproject )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(usex "$1" enable disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISE_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable $o menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-13.38.1.ebuild b/net-misc/asterisk/asterisk-13.38.1.ebuild
index 847f1d498afe..78d862215075 100644
--- a/net-misc/asterisk/asterisk-13.38.1.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar
 	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-16.12.0-r1.ebuild b/net-misc/asterisk/asterisk-16.12.0-r1.ebuild
deleted file mode 100644
index da613c5156fa..000000000000
--- a/net-misc/asterisk/asterisk-16.12.0-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9 )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISY_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.13.0.ebuild b/net-misc/asterisk/asterisk-16.13.0.ebuild
deleted file mode 100644
index da613c5156fa..000000000000
--- a/net-misc/asterisk/asterisk-16.13.0.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9 )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISY_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/asterisk-16.14.0.ebuild b/net-misc/asterisk/asterisk-16.14.0.ebuild
deleted file mode 100644
index da613c5156fa..000000000000
--- a/net-misc/asterisk/asterisk-16.14.0.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="Asterisk: A Modular Open Source PBX System"
-HOMEPAGE="https://www.asterisk.org/"
-SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz
-	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE_VOICEMAIL_STORAGE="
-	+voicemail_storage_file
-	voicemail_storage_odbc
-	voicemail_storage_imap
-"
-IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
-IUSE_EXPAND="VOICEMAIL_STORAGE"
-REQUIRED_USE="gtalk? ( xmpp )
-	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
-	voicemail_storage_odbc? ( odbc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
-)
-
-DEPEND="acct-user/asterisk
-	acct-group/asterisk
-	dev-db/sqlite:3
-	dev-libs/popt
-	>=dev-libs/jansson-2.11
-	dev-libs/libedit
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	sys-apps/util-linux
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez:= )
-	calendar? (
-		net-libs/neon:=
-		dev-libs/libical:=
-		dev-libs/iksemel
-	)
-	caps? ( sys-libs/libcap )
-	cluster? ( sys-cluster/corosync )
-	curl? ( net-misc/curl )
-	dahdi? (
-		net-libs/libpri
-		net-misc/dahdi-tools
-	)
-	freetds? ( dev-db/freetds )
-	gtalk? ( dev-libs/iksemel )
-	http? ( dev-libs/gmime:2.6 )
-	iconv? ( virtual/libiconv )
-	ilbc? ( media-libs/libilbc )
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua:0= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	newt? ( dev-libs/newt )
-	odbc? ( dev-db/unixODBC )
-	pjproject? ( >=net-libs/pjproject-2.9 )
-	portaudio? ( media-libs/portaudio )
-	postgres? ( dev-db/postgresql:* )
-	radius? ( net-dialup/freeradius-client )
-	snmp? ( net-analyzer/net-snmp:= )
-	span? ( media-libs/spandsp )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		media-libs/speexdsp
-	)
-	srtp? ( net-libs/libsrtp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	unbound? ( net-dns/unbound )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voicemail_storage_imap? ( virtual/imap-c-client )
-	xmpp? ( dev-libs/iksemel )
-"
-
-RDEPEND="${DEPEND}
-	net-misc/asterisk-core-sounds
-	net-misc/asterisk-extra-sounds
-	net-misc/asterisk-moh-opsound
-	selinux? ( sec-policy/selinux-asterisk )
-	syslog? ( virtual/logger )"
-
-BDEPEND="virtual/pkgconfig"
-
-QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
-
-pkg_setup() {
-	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
-	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
-	have reported that this module dropped critical SIP packets in their deployments. You
-	may want to disable it if you see such problems."
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
-}
-
-src_configure() {
-	local vmst
-
-	econf \
-		--libdir="/usr/$(get_libdir)" \
-		--localstatedir="/var" \
-		--with-crypto \
-		--with-gsm=internal \
-		--with-popt \
-		--with-z \
-		--with-libedit \
-		--without-jansson-bundled \
-		--without-pjproject-bundled \
-		$(use_with caps cap) \
-		$(use_with http gmime) \
-		$(use_with newt) \
-		$(use_with pjproject) \
-		$(use_with portaudio) \
-		$(use_with ssl) \
-		$(use_with unbound)
-
-	_menuselect() {
-		menuselect/menuselect "$@" || die "menuselect $* failed."
-	}
-
-	_use_select() {
-		local state=$(use "$1" && echo enable || echo disable)
-		shift # remove use from parameters
-
-		while [[ -n $1 ]]; do
-			_menuselect --${state} "$1" menuselect.makeopts
-			shift
-		done
-	}
-
-	# Blank out sounds/sounds.xml file to prevent
-	# asterisk from installing sounds files (we pull them in via
-	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
-	>"${S}"/sounds/sounds.xml
-
-	# That NATIVE_ARCH chatter really is quite bothersome
-	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
-
-	# Compile menuselect binary for optional components
-	emake NOISY_BUILD=yes menuselect.makeopts
-
-	# Disable BUILD_NATIVE (bug #667498)
-	_menuselect --disable build_native menuselect.makeopts
-
-	# Broken functionality is forcibly disabled (bug #360143)
-	_menuselect --disable chan_misdn menuselect.makeopts
-	_menuselect --disable chan_ooh323 menuselect.makeopts
-
-	# Utility set is forcibly enabled (bug #358001)
-	_menuselect --enable smsq menuselect.makeopts
-	_menuselect --enable streamplayer menuselect.makeopts
-	_menuselect --enable aelparse menuselect.makeopts
-	_menuselect --enable astman menuselect.makeopts
-
-	# this is connected, otherwise it would not find
-	# ast_pktccops_gate_alloc symbol
-	_menuselect --enable chan_mgcp menuselect.makeopts
-	_menuselect --enable res_pktccops menuselect.makeopts
-
-	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
-	_menuselect --enable pbx_dundi menuselect.makeopts
-	_menuselect --enable func_aes menuselect.makeopts
-	_menuselect --enable chan_iax2 menuselect.makeopts
-
-	# SQlite3 is now the main database backend, enable related features
-	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
-	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
-
-	# The others are based on USE-flag settings
-	_use_select alsa         chan_alsa
-	_use_select bluetooth    chan_mobile
-	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
-	_use_select cluster      res_corosync
-	_use_select curl         func_curl res_config_curl res_curl
-	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
-	_use_select freetds      {cdr,cel}_tds
-	_use_select gtalk        chan_motif
-	_use_select http         res_http_post
-	_use_select iconv        func_iconv
-	_use_select ilbc         codec_ilbc format_ilbc
-	_use_select ldap         res_config_ldap
-	_use_select lua          pbx_lua
-	_use_select mysql        app_mysql cdr_mysql res_config_mysql
-	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
-	_use_select oss          chan_oss
-	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
-	_use_select radius       {cdr,cel}_radius
-	_use_select snmp         res_snmp
-	_use_select span         res_fax_spandsp
-	_use_select speex        {codec,func}_speex
-	_use_select speex        format_ogg_speex
-	_use_select srtp         res_srtp
-	_use_select statsd       res_statsd res_{endpoint,chan}_stats
-	_use_select syslog       cdr_syslog
-	_use_select vorbis       format_ogg_vorbis
-	_use_select xmpp         res_xmpp
-
-	# Voicemail storage ...
-	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
-		if use ${vmst}; then
-			_menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
-		fi
-	done
-
-	if use debug; then
-		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
-			_menuselect --enable "${o}" menuselect.makeopts
-		done
-	fi
-}
-
-src_compile() {
-	emake ASTCFLAGS="${CFLAGS}" ASTLDFLAGS="${LDFLAGS}" NOISY_BUILD=yes
-}
-
-src_install() {
-	local d
-
-	mkdir -p "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	emake DESTDIR="${ED}" NOISY_BUILD=yes install
-
-	if use radius; then
-		insinto /etc/radiusclient/
-		doins contrib/dictionary.digium
-	fi
-	diropts -m 0750 -o root -g asterisk
-	keepdir	/etc/asterisk
-	emake NOISY_BUILD=yes DESTDIR="${ED}" CONFIG_SRC=configs/samples CONFIG_EXTEN=.sample install-configs
-	for conffile in "${ED}/etc/asterisk/"*
-	do
-		fowners root:root "${conffile#${ED}}"
-		fperms 0644 "${conffile#${ED}}"
-	done
-
-	# keep directories
-	diropts -m 0750 -o asterisk -g root
-	keepdir /var/lib/asterisk
-	keepdir /var/spool/asterisk
-	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
-	diropts -m 0750 -o asterisk -g asterisk
-	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
-
-	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
-	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
-
-	systemd_dounit "${FILESDIR}"/asterisk.service
-	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
-	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
-
-	# Reset diropts else dodoc uses it for doc installations.
-	diropts -m0755
-
-	# install the upgrade documentation
-	dodoc UPGRADE* BUGS CREDITS
-
-	# install extra documentation
-	if use doc; then
-		dodoc doc/*.txt
-		dodoc doc/*.pdf
-	fi
-
-	# install logrotate snippet; bug #329281
-	#
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
-
-	# Asterisk installs a few folders that's empty by design,
-	# but still required.  This finds them, and marks them for
-	# portage.
-	for d in $(find "${ED}"/var -type d -empty || die "Find failed."); do
-		keepdir "${d#${ED}}"
-	done
-}
-
-pkg_postinst() {
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
-		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
-		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
-	fi
-}
diff --git a/net-misc/asterisk/files/asterisk-13.33.0-nossl.patch b/net-misc/asterisk/files/asterisk-13.33.0-nossl.patch
deleted file mode 100644
index 5fb0c5650e54..000000000000
--- a/net-misc/asterisk/files/asterisk-13.33.0-nossl.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 2513235859fc50e8c28545977702b9b7b439f5f5 Mon Sep 17 00:00:00 2001
-From: Joshua C. Colp <jcolp@sangoma.com>
-Date: Wed, 24 Jun 2020 07:25:47 -0300
-Subject: [PATCH] menuselect: Resolve infinite loop in dependency scenario.
-
-Given a scenario where a module has a dependency on both
-an external library and a module if the external library was
-available and the module was not an infinite loop would
-occur. This happened due to the code changing the dependecy
-status to no failure on each dependency checking loop
-iteration, resulting in the code thinking that it had
-gone from no failure to failure each time triggering another
-dependency check.
-
-This change makes it so that the old dependency status is
-preserved throughout the dependency checking allowing it to
-determine that after the first iteration the dependency
-status does not transition from no failure to failure.
-
-ASTERISK-28930
-
-Change-Id: Iea06d45d9fd6d8bfd068882a0bb7e23a53ec3e84
----
-
-diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
-index 83f6098..a595ce8 100644
---- a/menuselect/menuselect.c
-+++ b/menuselect/menuselect.c
-@@ -630,14 +630,14 @@
- 	struct member *mem;
- 	struct reference *dep;
- 	struct dep_file *dep_file;
--	unsigned int changed, old_failure;
-+	unsigned int changed;
- 
- 	AST_LIST_TRAVERSE(&categories, cat, list) {
- 		AST_LIST_TRAVERSE(&cat->members, mem, list) {
- 			if (mem->is_separator) {
- 				continue;
- 			}
--			old_failure = mem->depsfailed;
-+			mem->depsfailedold = mem->depsfailed;
- 			AST_LIST_TRAVERSE(&mem->deps, dep, list) {
- 				if (dep->member)
- 					continue;
-@@ -655,7 +655,7 @@
- 					break; /* This dependency is not met, so we can stop now */
- 				}
- 			}
--			if (old_failure == SOFT_FAILURE && mem->depsfailed != HARD_FAILURE)
-+			if (mem->depsfailedold == SOFT_FAILURE && mem->depsfailed != HARD_FAILURE)
- 				mem->depsfailed = SOFT_FAILURE;
- 		}
- 	}
-@@ -673,8 +673,6 @@
- 					continue;
- 				}
- 
--				old_failure = mem->depsfailed;
--
- 				if (mem->depsfailed == HARD_FAILURE)
- 					continue;
- 
-@@ -693,7 +691,7 @@
- 					}
- 				}
- 
--				if (mem->depsfailed != old_failure) {
-+				if (mem->depsfailed != mem->depsfailedold) {
- 					if ((mem->depsfailed == NO_FAILURE) && mem->was_defaulted) {
- 						mem->enabled = !strcasecmp(mem->defaultenabled, "yes");
- 						print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
-@@ -702,6 +700,8 @@
- 						print_debug("Just set %s enabled to %d\n", mem->name, mem->enabled);
- 					}
- 					changed = 1;
-+					/* We need to update the old failed deps for the next loop of this */
-+					mem->depsfailedold = mem->depsfailed;
- 					break; /* This dependency is not met, so we can stop now */
- 				}
- 			}
-diff --git a/menuselect/menuselect.h b/menuselect/menuselect.h
-index 78ae8ef..d41859e 100644
---- a/menuselect/menuselect.h
-+++ b/menuselect/menuselect.h
-@@ -78,6 +78,8 @@
- 	unsigned int was_enabled:1;
- 	/*! This module has failed dependencies */
- 	unsigned int depsfailed:2;
-+	/*! Previous failed dependencies when calculating */
-+	unsigned int depsfailedold:2;
- 	/*! This module has failed conflicts */
- 	unsigned int conflictsfailed:2;
- 	/*! This module's 'enabled' flag was changed by a default only */
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
new file mode 100644
index 000000000000..d6f71e651cb5
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -0,0 +1,6 @@
+AUX chrome-remote-desktop-44.0.2403.44-always-sudo.patch 820 BLAKE2B f1e2c9d3a7bf2d53407b9ee4e4f34bf915d59502799bc4d38c9886d6c216dafb8ad957229a454da2ff750b00bc967e668cb022b06d4ad382e7427d61907970a1 SHA512 aa35c9e81b056fded2ff95b6fc7ab9cf3bb89282513b7bf1a04a9d25567d0e59da9c8c9877500e7290e40d712f4be06ae8b482d3f830d818ea5897e6ffde248b
+AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
+AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
+DIST chrome-remote-desktop_88.0.4324.33_amd64.deb 33645072 BLAKE2B 5fc565c3a27307e46ff307ad2e68a9a390b5fb86be9d3d8bb5f82f3d22013f70af18002c888d5df82956b6f33b3397cf2cb8b9a7e4c07db480ead81abbb5743c SHA512 0cf6ebe8ce916874be79255faf870b20df892ce4825902996685416cedd8d8ef52215e7f278301fd6ff11e2cbc3b2e82078d7b0ee23ab35669760b1102d5827e
+EBUILD chrome-remote-desktop-88.0.4324.33.ebuild 4716 BLAKE2B 32dd5fc913b4240e91d6bb62817e4d7fe1028ba93b1e51a0022e99e7e2bef4893b1e18c38bdd1da462bd1bd37ee84618a974cff71ec3947318177a5902aaa3f3 SHA512 6c8053cfb1137594e206b16a24bb1e765b2554c4159998cda82c499310cd3adae4466cec09d5d21d6f76664f00e56b0684b1a6fd4383d1941325aea017b77f51
+MISC metadata.xml 324 BLAKE2B 06aa537ecdc6bbcacbbfd245dfb6400f988a9479963032ba1f8734445342cb22cb943e8cbb77f1c1fb8a6f175506b19606ca43aafda5c503c6b38f36ece15a90 SHA512 0b117b42b32bda19d274c55a1673115eabdea39cd77fb5498d72040fa3eb1666c5e990b64918bf20fee113c42e8cba5888544621d284aa9db95fe895d805c121
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
new file mode 100644
index 000000000000..ace3c7112e56
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-88.0.4324.33.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#  https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit unpacker python-single-r1 l10n
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop"
+HOMEPAGE="https://support.google.com/chrome/answer/1649523
+	https://chrome.google.com/remotedesktop"
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="xrandr"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="bindist mirror"
+
+# Packages we execute, but don't link.
+RDEPEND="app-admin/sudo
+	${PYTHON_DEPS}"
+# All the libs this package links against.
+RDEPEND+="
+	>=dev-libs/expat-2
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+	gnome-base/gconf:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	sys-apps/dbus
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/pam
+	x11-apps/xdpyinfo
+	x11-apps/setxkbmap
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/pango"
+# Settings we just need at runtime.
+# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of xvfb.
+# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before being checked.
+# - The Xorg invocation uses absolute paths with -logfile & -config which are rejected.
+# - The config takes over the active display in addition to starting up a virtual one.
+RDEPEND+="
+	xrandr? ( x11-apps/xrandr )
+	x11-base/xorg-server[xvfb]"
+DEPEND="$(unpacker_src_uri_depends)"
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+)
+
+src_prepare() {
+	default
+
+	gunzip usr/share/doc/${PN}/*.gz || die
+
+	cd opt/google/chrome-remote-desktop
+	python_fix_shebang chrome-remote-desktop
+
+	cd remoting_locales
+	rm fake-bidi* || die
+	PLOCALES=${PLOCALES//_/-} l10n_find_plocales_changes "${PWD}" '' '.pak'
+}
+
+src_install() {
+	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
+	rm_pak() { local l=${1//_/-}; rm "${l}.pak" "${l}.pak.info"; }
+	l10n_for_each_disabled_locale_do rm_pak
+	popd >/dev/null
+
+	insinto /etc
+	doins -r etc/opt
+	dosym ../opt/chrome/native-messaging-hosts /etc/chromium/native-messaging-hosts #581754
+
+	insinto /opt
+	doins -r opt/google
+	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+	fperms +s /opt/google/${PN}/user-session
+
+	dodir /etc/pam.d
+	dosym system-remote-login /etc/pam.d/${PN}
+
+	dodoc usr/share/doc/${PN}/changelog*
+
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Two ways to launch the server:"
+		elog "(1) access an existing desktop"
+		elog "    (a) install the Chrome plugin on the server & client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) on the server, run the Chrome plugin & enable remote access"
+		elog "    (c) on the client, connect to the server"
+		elog "(2) headless system"
+		elog "    (a) install the Chrome plugin on the client:"
+		elog "        ${PLUGIN_URL}"
+		elog "    (b) run ${EPREFIX}/opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
+		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
+		elog "    (d) run start-host again, and past the code when asked for an authorization code"
+		elog "    (e) on the client, connect to the server"
+		elog
+		elog "Configuration settings you might want to be aware of:"
+		elog "  ~/.${PN}-session - shell script to start your session"
+		elog "  /etc/init.d/${PN} - script to auto-restart server"
+	fi
+}
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
new file mode 100644
index 000000000000..d303e5e753f9
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop-44.0.2403.44-always-sudo.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/541708
+
+just use `sudo` for everything
+
+--- a/opt/google/chrome-remote-desktop/chrome-remote-desktop
++++ b/opt/google/chrome-remote-desktop/chrome-remote-desktop
+@@ -1092,12 +1092,7 @@
+       logging.info("Group '%s' not found." % CHROME_REMOTING_GROUP_NAME)
+ 
+     command = [SCRIPT_PATH, '--add-user-as-root', user]
+-    if os.getenv("DISPLAY"):
+-      # TODO(rickyz): Add a Polkit policy that includes a more friendly message
+-      # about what this command does.
+-      command = ["/usr/bin/pkexec"] + command
+-    else:
+-      command = ["/usr/bin/sudo", "-k", "--"] + command
++    command = ["/usr/bin/sudo", "-k", "--"] + command
+ 
+     # Run with an empty environment out of paranoia, though if an attacker
+     # controls the environment this script is run under, we're already screwed
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
new file mode 100644
index 000000000000..aa3d8919c87f
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
@@ -0,0 +1,7 @@
+# /etc/conf.d/chrome-remote-desktop: config file for /etc/init.d/chrome-remote-desktop
+
+# List of users to start Chrome Remote Desktop for.
+CHROME_REMOTING_USERS=''
+
+# Options to pass to chrome-remote-desktop.  Only the -s option is interesting.
+#OPTIONS='-s 1600x1200 -s 3840x1600'
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
new file mode 100644
index 000000000000..272923ce6afb
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="checkconfig reload"
+
+CRD=/opt/google/chrome-remote-desktop/chrome-remote-desktop
+
+depend() {
+	need net
+	use logger
+}
+
+checkconfig() {
+	local ret=0
+	if [ -z "${CHROME_REMOTING_USERS}" ] ; then
+		eerror "You must set CHROME_REMOTING_USERS in /etc/conf.d/${SVCNAME} first"
+		ret=1
+	else
+		local user
+		for user in ${CHROME_REMOTING_USERS} ; do
+			if ! id "${user}" >/dev/null ; then
+				eerror "Invalid user found in CHROME_REMOTING_USERS: ${user}"
+				ret=1
+			fi
+		done
+	fi
+	return ${ret}
+}
+
+for_users() {
+	local user ret msg log
+	msg=$1; shift
+
+	for user in ${CHROME_REMOTING_USERS} ; do
+		ebegin "${msg} ${SVCNAME} for ${user}"
+
+		# We need to background the app as it won't fork until the network
+		# (including DNS) is available.
+		start-stop-daemon \
+			-b \
+			-u "${user}" \
+			-x "${CRD}" \
+			-- \
+			${OPTIONS} \
+			"$@"
+		eend $?
+		: $(( ret |= $? ))
+	done
+
+	return ${ret}
+}
+
+start() {
+	checkconfig || return
+	for_users Starting --start
+}
+
+stop() {
+	for_users Stopping --stop
+}
+
+reload() {
+	for_users Reloading --reload
+}
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
new file mode 100644
index 000000000000..09ff7ff62a4c
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>vapier@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="xrandr">Enable support for the XRandR extension for dynamic desktop resizing</flag>
+</use>
+</pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e99898e7c174..c07008272fd8 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,5 +2,5 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.74.0.tar.xz 2400972 BLAKE2B bef9e01493994afc933549a78b41065708aeaa9f6f5cdd1dbf2f43bbb03bbc97b17308b8bda5f11599c3cc0c6c77903e6fa6f1310ff874fad902a59566b51e8a SHA512 5d987f0b4d051c9e254f14d4e2a05f7cda9fb0f0ac7b3ca3664a25a51ee5ffe092ee072c0d9a613fcd3f34727d75bba14b70f5500cb110ca818591e071c3e6f4
-EBUILD curl-7.74.0-r2.ebuild 8779 BLAKE2B 701fb888abf590527a4ddbc689dd9faa1752ad934a8227029cd577ccd87640fb900c902e1520d14e0bc1b1fa4b7205acdcf42d897cf4853457806617f23342a7 SHA512 fbbd4a20583fa1577b5e3b2c9f4b424ee2f1578004f53008d95e0a62e52726c4343c12672e494575a7a74e53b233105ad2f1ca09460f9145bc71ed541f86bdfe
+EBUILD curl-7.74.0-r2.ebuild 8757 BLAKE2B 04230b4f348706178adc7d63a63c0b082eb46d1c5a9a7889af69d74fe32fed0308f736f7b87049470e41e2194d9c5277cd1ec7fa7aa21b6e1ba781a43df6f1de SHA512 8b57ee13c05d23b39e30c71383aaa2041f8603e5d46d78719dad303658573596bddd0a4fe9461d5d95fa9b8e90c6fba26d3e3874636dfa410eba8708d9c41d03
 MISC metadata.xml 2032 BLAKE2B b9406f27a492123f45151d54e34056f26aac11aed12c8c69230f0a41602b42198d102edcdb36d6b890c818fc0b0ccce82b459e376f102d39a096646a17462475 SHA512 c33c12443b4489d36b9506b1a361547d5691bc0a6d997d5ae68869dc8f7936a6418b209bf80f61502c74e6722907c241d269089cb49b7c43a3c086dd52c8c16d
diff --git a/net-misc/curl/curl-7.74.0-r2.ebuild b/net-misc/curl/curl-7.74.0-r2.ebuild
index acd4ec78ad38..66fabfa2438e 100644
--- a/net-misc/curl/curl-7.74.0-r2.ebuild
+++ b/net-misc/curl/curl-7.74.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,8 +11,8 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="curl"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap libressl mbedtls metalink nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads winssl zstd"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 403c43c8b31c..2881d84276fe 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,7 +1,9 @@
 AUX gsasl-1.8.0-sasl-gss-extra.patch 950 BLAKE2B 958805e574a26f13a199eb5f53df9830586d8d3e81c32bad9a4c711c57ee097139c2653426eed3045f16bd76e4ce1c2bb6ed70fbd378266fedc8247da2a815ab SHA512 0f8ad16b96265221bb045b19724b7a247350e9503b7e5abc92905cc07c11bdafb9a92e91d1959d33075ec96631e6f033b20192993c9ee732d71d86ba5ac3fa22
 AUX gsasl-1.8.1-sasl-gss-extra.patch 944 BLAKE2B f48eba6d1b96ab5f7e1cdc5c2220f4a5f1bd34c40527edf65a2aaec81a85004106a229f18c0d9d623d81e6e98f1786b213b2e6481814b1ee0e11c44eac9ff33d SHA512 ea406d5de99ebbff454ea453cc3c857c79d0120405d772cd893a03840d720e97000bd1edac1ec52f44208146287531a268bd582a0e146b6097b48671b92b9c88
+DIST gsasl-1.10.0.tar.gz 5946076 BLAKE2B eedbdd6a080af34581c6e793d5d6db4ebbbc10c1a31dba1edc632de78a529fc2acf2b5e4df3a7bc9a721c6bdb819aade85d65245dbb14405413b933220454a79 SHA512 8b1dc87e85dbfd0255b3b43c4b7f9c2e896cb03efe4cd4af86393b62fd193665aae4ce59e66db736722e32babfcea6d4f6ddd3c5f069dcc4210f7e9531043e4a
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
 DIST gsasl-1.8.1.tar.gz 5774550 BLAKE2B 0144b0d7b2750686f3447a9d154a2d0b7fa5261b614bce74d8fdedaca140f9d964868b57f1a67cf2f5fc446c5715bae3dcdb4e06a7bedc5b66d50fa52f62e93b SHA512 8973f5af12cc17aae76a4a2ea887d17e74e48b1ce896dfd62fde8cb874ed965d77c62d671ff86ce3217158e58a7a521b7fde9ea606f73c3a912a8973f1b204cb
+EBUILD gsasl-1.10.0.ebuild 1739 BLAKE2B 907f6b7dec317d608bf4dfc54cafecd7d387a7f22de0a13b7ed94d7f7a00e3c56cde1788269ac0314690a6cfccffc857c6d87a23f16b3f77366a6da182508e06 SHA512 f905bf225e6196a2c3cf71332e5a0050d5d42974706336d7b24acf46b5a4d68a822e71397c901d26162607b57c61a343164483fce0a849f5f415f5b5b9dc66bd
 EBUILD gsasl-1.8.0-r1.ebuild 1797 BLAKE2B 5919ec09d3f0c47dd7cb447639d91de50a0bb774e3a74fd30b965d7c6a68c87e46b5cbe4bb249d0acf99e2e5c0afacbfb5a060170933a7681893be6241f77039 SHA512 a445f4165baf5fe2e1f0cdb66e58c0d93173b654a85a4acb72863cdf7c25d96c62710a77db3642de9af7010ec28b946c2f687d92898e4919151c54570a87d217
 EBUILD gsasl-1.8.1.ebuild 1797 BLAKE2B 8793ae17801be1417f1d294dc825a49195483703ee13a29e457dd169c4a3512954187dbe82aee5474a71a65b22e462045ddd29c511dec65d3a8a439feb2ea748 SHA512 2856a453b72e26561d6b0f2bee46829a2af992b0f37fb4c9c41d4c2bdca806c6a00b919a4e3e144a0e14ee62038d29cbc6a4b3a6d0b8dd6680aaa47716137641
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.10.0.ebuild b/net-misc/gsasl/gsasl-1.10.0.ebuild
new file mode 100644
index 000000000000..abf23f7845da
--- /dev/null
+++ b/net-misc/gsasl/gsasl-1.10.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL client, server, and library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
+
+DEPEND="
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( net-libs/libntlm )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e '/gl_WARN_ADD(\[-Werror/d' \
+		-e 's/ -Werror//' configure.ac || die
+	sed -i -e 's/ -Werror//' lib/configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl
+
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl="
+
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
+	fi
+
+	econf \
+		--enable-client \
+		--enable-server \
+		--disable-valgrind-tests \
+		--disable-rpath \
+		--without-libshishi \
+		--without-libgss \
+		--disable-kerberos_v5 \
+		$(use_enable kerberos gssapi) \
+		${krb5_impl} \
+		$(use_enable kerberos gs2) \
+		$(use_with gcrypt libgcrypt) \
+		$(use_enable nls) \
+		$(use_with idn stringprep) \
+		$(use_enable ntlm) \
+		$(use_with ntlm libntlm) \
+		$(use_enable static-libs static) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/lib*/lib*.la || die
+	fi
+
+	doman doc/gsasl.1 doc/man/*.3
+
+	if use doc; then
+		dodoc doc/*.{eps,ps,pdf}
+		docinto html
+		dodoc doc/*.html
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index c8551b389241..996da7615aed 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1,4 +1,4 @@
 DIST ipcalc_0.42-2.debian.tar.xz 6144 BLAKE2B 7fa1e32f9c713b4f3dfa8636f9bb4b0bd70e09e3d02e71f1f2186e8e2ab381638eb33e63c24f41dfa948db11b7e877a147d22363d105ac26e98ff509d1cd0aa2 SHA512 6b7049bc5e27e22dbbca12913716757cb3f5b91d0a8f729d35a67971c763b0bea8ab65c24fe31ad43755aedb68650c1d8b3f3e770228ed6517b43e83735086ec
 DIST ipcalc_0.42.orig.tar.gz 25903 BLAKE2B 5abff0f234829ef84345645634f1b12287456c26a42cb65856f26ac12699d5f100a2ef432a6d19627f72d800e65257d46bc0edd8ec1bf4054dcdf843d2ee158f SHA512 4e67ccdbb7e42ced39ee8ac83e47585d400c1b0a26e74a909c2e29e7f2256e37b06855cc29f0272b71c5ff6bdd8252e2563ad89562cd8d04ce0fa032f6f3fb34
-EBUILD ipcalc-0.42_p2.ebuild 754 BLAKE2B 3ba400a53b367a06d49798569d2d4068bff0771455ba76eae8731e57f6f850e6bf3f8687d5d4659cfcfb549de54fa011390c8271025e41e7b02331993ceb42b5 SHA512 60e6ce31e70e00f45cc9b57114b0ccfd3ffe0d84961ef1743fbfd04623e051e0b9dbec0de921609c8c374a408d1fbc76c9ac704b193d6d277f7184f3b8bb1130
+EBUILD ipcalc-0.42_p2.ebuild 743 BLAKE2B 72361d8e3115b76158d39f9705b622bb53d102f5b1f89b06ccb4f4066cc27ed4957ee81cd8672407c71f3a0379a4424e168c497aa2e4962dfd9f9de5c935576d SHA512 2a114077d4c92ca6e66e62eea89911c9844aa9241c2e8345263c12af86dbf7142592bd669e5a9acb2371bfd9a2de031fe6f84dc68b6266f02b736f6d9b144a6c
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index cbd9575e36f9..cae6e413db63 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
 "
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 9717de9653f1..9ec9942c0ad5 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,16 +1,12 @@
 AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
 AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
-AUX iperf-3.0.5-flags.patch 1323 BLAKE2B 14a7c9a889d5dd370553de7151f4103ba638559ee1111a2f8b4c479edd4af454652989843c8444dffcbb72206dd530cfe7204a80bba3123219f81b95acd8f1f5 SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
 DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
-EBUILD iperf-2.0.13.ebuild 733 BLAKE2B 0478c8a8372a9addc365507fbef725842032f11a7d4a5ef8b2f66d0d85b1dbd16ff1296b88d894cfde6c615ac3743067850aa63ef93823b8d1f255190a127b08 SHA512 7c9e755bb87475142756ada69dbc44248446576ba0de64a69ba9207d4e5de4614557b8127eec745d03c6bce90285e67819b90aba5c91b026a31ef67b103a1f3b
-EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B cee6dcc3daf33132305acfffd2f7a366b43feecf47794a747750f0eb86fd6339971466ebf09e5361a552ed641b2e8c40e1267ed6c6451d701e427ec494c6e92c SHA512 e33d133e23586a916691ed89956fe354fdd9e153dbb6087450716f6d05216dc9be64e09289b5aea0bcf24b2f8a35ff5dbaf3903310e8ca3cf55c4fc3fb8802e6
-EBUILD iperf-2.99999.99999.ebuild 729 BLAKE2B 7fbe549c0035bdc6accaccfc53a2f02a84b41ec12693a2a36a9eba172c6007dd6651a4f3cdd0121979e80d2b09dce90a3211390bf91f4dd3a18e37d831a81bbc SHA512 b444c695aa9b2ca0e498dc392dab7e56fbe95b075ca6c935508e8c654808fbead3caa73952d55438be38d7ca4a3ebddaf82841bdabd753e8610b84deadeba4b1
-EBUILD iperf-3.6.ebuild 1004 BLAKE2B cbe38230df4ee246dacfb0ca07cdfa2fb3887edc29ca106d87cc39e013682bfad690ef6a5a56b2d640758dd275c252126ac4f294a9e937bae9bcd8896ed91372 SHA512 0f3f0070eb6c21ff64a42ff1d21cf7b8dc1c739d1bf06d07495a32e43c4ba1fb85b40b13c1c1c292bdb665eaa3c0fc806ac85a96fefb280dbbf42ae98449e2da
-EBUILD iperf-3.9-r1.ebuild 979 BLAKE2B 061cea3307d243d91460f9f2fe5c3bc3bf3177b4267e67bc166b7264a7743f88101e619f51aca7d8ceffb885f569421b3b54ff0c0a9a2de9739deb6c18509e00 SHA512 4293b938d98a5720d158d63ff4b73fd01de37a98ab48ccc42d0569f889d75b7b93615dbdc54fc04f99823cc401ef632f0e9e7e038293115ea615de788d218888
-EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 6c697e6a3693d5be60eb35ce1a271d1cf4842037e17f3a7279e76dccdf9db2547c3a222ad5d3074126d1bf522d2f06d6fa1b9f4251c1d9fa4635e727ed6ac476 SHA512 0709b7db179b7ae4ceca704ecc3c162ffabb89d6df9bd3d4f44f2d95b7b24e8b26cf89e1f06278d9dbaa55379d607307f334d441a4eae9ca3ecc474855d93357
+EBUILD iperf-2.0.14a.ebuild 860 BLAKE2B fbbabc49ddb3d4b65306ce6c900a62f6242651cf1368dac0dc1ede1acd2d07f108973eb05c55491436838502c74124af7dcc4ce06f054dd90bcb6c53042eeae5 SHA512 176d966c356dcef6a7ed792446b9814ced18bf745d7927f05bccbb10729302e430612ab594f24ac6b89e3a53226495c7ca866b2e5bb513a41bf7700896aab55f
+EBUILD iperf-2.99999.99999.ebuild 674 BLAKE2B ca210a0f4320ed023c91d6e764b836bd87dde603944626fa5a65ff59ef7e7a6c1a469c5135f4e75499256992ee54762132f7939bf617a8d5cd2e4312143f3741 SHA512 1b2259028c491938224af5ddcdecaccff0f8a72e603a46c068a7bf1e5b030c101e3f933ed71c62e2bc471c8d3278adc400a6968f9496bb034c54798ce0984252
+EBUILD iperf-3.9-r1.ebuild 972 BLAKE2B b5ef4d92222f61fed88b9579e109b4f429916065bac12e0704e06e04ae88c0289f7cdf8a24e2e98dda2db56fb0a6ce214aa929c2fe6179582f4932e442cfd663 SHA512 57ddd35949dfbb4878391b364331d89dab2dd3e6ce97c529b385822a322a4ae34094c558e4ee0e362ea8f183574372504536e8a359cd9121d66acbbcabdf4e9e
+EBUILD iperf-3.99999.99999.ebuild 797 BLAKE2B 7a617faeec980c5f3cd46e6416b0c28fe2d4eb5233937925072426621b8c064a6f666f40b73e168e29eea11c1ff4ce051f40ca7d6b358d20b5a7180dad7ac011 SHA512 93168f91782c5575be57075ea114cf3c7594f14ec8a405b62e654b949615966bdf3364366b7a769f7306197a22a073999de446f65729a5a963924fec29834465
 MISC metadata.xml 569 BLAKE2B 66b45104e695c19a4c0e9bb804e75c2f5236d7b9e6b6741df3ab40669c79374a7b01b080c3d99b21f522fd48554713cc44af543c661168aaa0a0989c8dbffeab SHA512 5c67ca8f97c48097ff3e1f8c2a738deebf2357c15f82e19f9b695da6892240a78e3fd2af265b9ebaa2f706e46d09bfc99401f0538ceebef448a911db3197b4ab
diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
deleted file mode 100644
index 9c11c282c339..000000000000
--- a/net-misc/iperf/files/iperf-3.0.5-flags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-* Do not inject -g
-* Do not make a profiled build
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES         = libiperf.la                                   # Build and install an iperf library
- bin_PROGRAMS            = iperf3                                        # Build and install an iperf binary
--noinst_PROGRAMS         = t_timer t_units t_uuid iperf3_profile         # Build, but don't install the test programs and a profiled version of iperf3
-+noinst_PROGRAMS         = t_timer t_units t_uuid         # Build, but don't install the test programs and a profiled version of iperf3
- include_HEADERS         = iperf_api.h # Defines the headers that get installed with the program
- 
- 
-@@ -37,14 +37,13 @@
- 
- # Specify the sources and various flags for the iperf binary
- iperf3_SOURCES          = main.c
--iperf3_CFLAGS           = -g
-+iperf3_CFLAGS           =
- iperf3_LDADD            = libiperf.la
--iperf3_LDFLAGS          = -g
-+iperf3_LDFLAGS          =
- 
- # Specify the sources and various flags for the profiled iperf binary. This
- # binary recompiles all the source files to make sure they are all profiled.
--iperf3_profile_SOURCES  = main.c \
--						  $(libiperf_la_SOURCES)
-+iperf3_profile_SOURCES  = main.c
- 
- iperf3_profile_CFLAGS   = -pg -g
- iperf3_profile_LDADD    = libiperf.la
diff --git a/net-misc/iperf/iperf-2.0.13.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
deleted file mode 100644
index 865bc2202da2..000000000000
--- a/net-misc/iperf/iperf-2.0.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="https://sourceforge.net/projects/iperf2/"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 threads debug"
-
-DOCS="INSTALL README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable debug debuginfo) \
-		$(use_enable ipv6) \
-		$(use_enable threads)
-}
-
-src_install() {
-	default
-	dodoc doc/*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
index 6c6936429add..8e383190aae1 100644
--- a/net-misc/iperf/iperf-2.0.14a.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -2,23 +2,25 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="https://sourceforge.net/projects/iperf2/"
 SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz"
+S="${WORKDIR}/${PN}-2.0.13"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 threads debug"
 
-DOCS="INSTALL README"
+DOCS=( "INSTALL" "README" )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
 	"${FILESDIR}"/${P}.patch
 )
-S=${WORKDIR}/${PN}-2.0.13
 
 src_configure() {
 	econf \
@@ -33,6 +35,7 @@ src_compile() {
 
 src_install() {
 	default
+
 	dodoc doc/*
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
index 5d1c5b42d4a4..a4087a924a8e 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
@@ -10,13 +11,9 @@ EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS=""
 IUSE="ipv6 threads debug"
 
-DOCS="INSTALL README"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
-)
+DOCS=( "INSTALL" "README" )
 
 src_configure() {
 	econf \
@@ -31,6 +28,7 @@ src_compile() {
 
 src_install() {
 	default
+
 	dodoc doc/*
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
deleted file mode 100644
index 15805e3908a0..000000000000
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils ltprune
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libressl sctp static-libs"
-
-DEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.5-flags.patch )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	use sctp || export ac_cv_header_netinet_sctp_h=no
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	prune_libtool_files
-}
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
index 05b4323e7917..d53aca6f6b77 100644
--- a/net-misc/iperf/iperf-3.9-r1.ebuild
+++ b/net-misc/iperf/iperf-3.9-r1.ebuild
@@ -7,10 +7,11 @@ inherit systemd
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
 SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="libressl sctp static-libs"
 
 DEPEND="
@@ -18,11 +19,9 @@ DEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	sctp? ( net-misc/lksctp-tools )
 "
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/_/}
-DOCS="README.md RELNOTES.md"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "RELNOTES.md" )
 
 src_configure() {
 	econf \
@@ -32,6 +31,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
 	systemd_dounit contrib/iperf3.service
diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild
index 14dfc1e065cd..d209c9b4ed3d 100644
--- a/net-misc/iperf/iperf-3.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-3.99999.99999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools git-r3
 
 DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
 HOMEPAGE="https://github.com/esnet/iperf/"
 EGIT_REPO_URI="https://github.com/esnet/iperf/"
+S="${WORKDIR}/${P/_/}"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS=""
 IUSE="libressl sctp static-libs"
 
 DEPEND="
@@ -18,11 +19,9 @@ DEPEND="
 	libressl? ( dev-libs/libressl:0= )
 	sctp? ( net-misc/lksctp-tools )
 "
-RDEPEND="
-	${DEPEND}
-"
-S=${WORKDIR}/${P/_/}
-DOCS="README.md RELNOTES.md"
+RDEPEND="${DEPEND}"
+
+DOCS=( "README.md" "RELNOTES.md" )
 
 src_configure() {
 	econf \
@@ -32,6 +31,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	newconfd "${FILESDIR}"/iperf.confd iperf3
 	newinitd "${FILESDIR}"/iperf3.initd iperf3
 	find "${ED}" -name '*.la' -delete || die
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 97333cd85a74..8e36792e7a63 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,3 +1,3 @@
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
-EBUILD keychain-2.8.5.ebuild 647 BLAKE2B 2dabfa4b5c426d10a978ff80a5bcde0404f758568af30f34d640cb42909f97e148704972bcba55e2c82ad8f03b185ed2b8d1db9e6f75e168b05f7f9608bcdb1e SHA512 90f28770f6a26c28fa78eff31257e03017abdbc8e3416bcd6790f6177fbc6e3bd111a6da518819cd4ab3f5d0fd2695d81592f56f90d7b0c2baae663da4964124
+EBUILD keychain-2.8.5.ebuild 636 BLAKE2B c9c96a4ac7a8488a60e8a8ca85a68d60165cf7335432fa8af5fca0820810f6765896b69bdd58dbc0c65843a0c32727861d7e55c013f63ed4d4c5debf91ced96c SHA512 e0ff068577b86ea54a64c300e785ec60eaf6bffe8797dc39696882c40e53302f5876dd14d44240a9ee6c24aaf7ef2c39c46269086f2a95740d43d5896541282b
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 1b3a87b347f0..46f1e43d8fb0 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index e21623728f0f..cc36f5bfb20d 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -8,6 +8,6 @@ AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba55
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.22.tar.gz 532713 BLAKE2B 90787522f36d9d4389438334572725df18050ae67bda2d97cde67b01492ca81772ddf7e83e02f71031ca909402a68f3db085ef6bece6e032ce580676a8a722f3 SHA512 19804c2847679eb018a0221b0717ebbcd2cd33b7f03176cc0d77b7405152dc944d3f5c39d0d81fcb6c08a2fa9317959e25587e7cb50718fdb6675288b2b078aa
 DIST memcached-1.6.9.tar.gz 556137 BLAKE2B 429d0d5de480d0a17a2c9942f595fab125d60ef1f3ff88754ab6e97eb9acdb71b26e40323babc7197e41d1605a82d2f094ce5638d2f4442467c8f652e20aaa44 SHA512 2169225aefe6bd7481d919ae3ef95ed85d2ed595f49daceeb13d2dc268097d4aee98cf604824fca103efcdffa7461bb26814209906a5dabf1a5d30af43f6a66c
-EBUILD memcached-1.5.22.ebuild 2945 BLAKE2B 0c4c35283d3974009dbd401699b8bb10e695b9d608daceb87402316b083772c2f1ef932d9ccf72ca17bc895602e7ac032fcd215bf7a40a9d29d8843ef774b01c SHA512 a22de0a032ffd098a4283ebf97aefc0e315744d59893c61110a46eba734f78ec4f98d1c8968756471811244fd02c38b7d17f83a385aeb1117aec0dee9a977618
-EBUILD memcached-1.6.9.ebuild 2879 BLAKE2B f544543fa423ec039db5de7f4833e827e751abe31c7238ccd8449dc1ec9d04e793acccd892b03b2251e1ee72232983211c4185d55b0dc66bd09124b97c77c0de SHA512 e89bbf64686b0edd4514f42707ecec7aac5dd34e4a6892052b51d0408d71c42ba14fe9a56eec83556d1a4664cb19fbbe638b2cf77a6c78e332edc05a745c4121
+EBUILD memcached-1.5.22.ebuild 2934 BLAKE2B cb3e916ad63d33c7444716b6e527a5c39c22c5dfd745cbb473e8dc8cad02e9a73603edd59cdf6b5f46e99ff41147604ec657857f511d1751ce687f257d9cebd9 SHA512 0205da0a3219f7f9cbab4c921f73e0296adbe5d8fc13c33684439ba7134a13ef0b92ac091bf96d8abb728e7617c3e5d7aa6ae925a4b52ab1349d1d92448d6d86
+EBUILD memcached-1.6.9.ebuild 2864 BLAKE2B 33ab7091789346b61de45655d17fdbe4333a4f5016db20adb412c6ca50358a8af3b86ee5ec50a439c87ebe91ed2c2556813a7dde0de2b1476913285654bf251a SHA512 fe7a796d5d868ad6e40515deee9b83420e2f38ebefb289c2cae4fd1b1a7b3f5a0e6fde39dd1748e022ff371c25d42df0a3b0ebabf75b308c5243c3708d95d125
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.22.ebuild b/net-misc/memcached/memcached-1.5.22.ebuild
index 29623384ac99..8bf787f27bb8 100644
--- a/net-misc/memcached/memcached-1.5.22.ebuild
+++ b/net-misc/memcached/memcached-1.5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.6.9.ebuild b/net-misc/memcached/memcached-1.6.9.ebuild
index 563ec54b1aea..c0865697796d 100644
--- a/net-misc/memcached/memcached-1.6.9.ebuild
+++ b/net-misc/memcached/memcached-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index d42eae06068c..501180c96f1d 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,5 @@
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
+DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
 EBUILD mobile-broadband-provider-info-20190618.ebuild 471 BLAKE2B 3dd2b83a80549cac5a0249633c04de1c397d6995dbf7621655fe10dd993db3420b4e7ed30a89efb2bc0cbcebe32d7d687b92c3635da6e18880729fbf006dbfa4 SHA512 bd040faa3a25d10b21d38e558a2a3c2fd2ed95eb0f3e886c2dfb24682f18bb260b9a282bb7d8bb2d8d3f3de37053418e30a2efa43479b620bb0c80a886801f55
+EBUILD mobile-broadband-provider-info-20201225.ebuild 481 BLAKE2B cd7584e18caf9bb81b3bd5387374fba2deb07b88400045882ec72212b1bfba7a93cd32fcd55274f781f65c0aace945ce207c0689d6ced78cf5dde78c32a14eab SHA512 f84193a0923bd8e8da619ec39040ea5bd86e41bc7fdc94c2f523888d0a79204320ba4a3a849e642bef7c6bd1639123ad2c9078f953b680f67f749cad39c67e0a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
new file mode 100644
index 000000000000..29c33fd46f82
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org
+
+DESCRIPTION="Database of mobile broadband service providers"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
+
+LICENSE="CC-PD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( dev-libs/libxml2 )
+"
+
+DOCS=( README )
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 74133f55a7df..9368c28efa24 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,8 @@
 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.14.8.tar.xz 2255964 BLAKE2B 8f0e4e4747b3603795b533c41949ef7180922e92b7b26348145e18ffaa38f23cccbcb6662ac912216d33b4aef805c5f7ad10aef8029ffd16eb30b331fc2ca88e SHA512 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
 EBUILD modemmanager-1.10.0.ebuild 3702 BLAKE2B 7b1d1e5ec167f1cc45d72e85e7a65919ff502f3e54a0a74d0227af24970f52b0bb51ffc571b458ff6e1d51cef4e5f9f0d3996c1e2864b8ded06cca6692a018e3 SHA512 283613155d8d8c791c315564482d083c9b0f60c8461c558a3192baecca36cef67f6b2de3b444d4593664f452248026422d77cbc097dfa90b5b0bfce77e0b9f0d
+EBUILD modemmanager-1.14.8.ebuild 3671 BLAKE2B ae2cd80d8edc4cb76141aa243e4dc0cc61c453de288d5e0d6bb8409915871cd953abb341bdc21eb44ff99594128228971bb74fcab141baa2419a9551edeabbdc SHA512 c3a52336779844143cfd7103151bc6211d5da75d3d3564ded60a788bcd9b1fb85f8173092803a447c23eceeb01ae85276d9b5fa466d084ae5b3c9fe7875ebf77
 EBUILD modemmanager-1.8.2-r1.ebuild 3702 BLAKE2B 6b166143bca2c72892dbc38147538f9cc9da01a5a677d18438597ed80115d46021c130c0d8c228cd007ace5fbbcca570fd76f26bc95e6600b9aa5096be4aadcf SHA512 f5ccf0d43cc548bfcc024b46f33b78d337910670c7eed1c5a882d47b43ca9341dce00d4f72dfdbc0bec5bd989b56d845e4269a0403ba0e9d21cbf286b7fb3c4b
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.14.8.ebuild b/net-misc/modemmanager/modemmanager-1.14.8.ebuild
new file mode 100644
index 000000000000..926d0eeec65d
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.14.8.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 readme.gentoo-r1 systemd toolchain-funcs udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+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"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+DEPEND="
+	>=dev-libs/glib-2.48.0:2
+	udev? ( >=dev-libs/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.24.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.26.0:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+RDEPEND="${DEPEND}
+	policykit? ( acct-group/plugdev )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-Werror
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-suspend-resume)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use elogind; then
+		local pkgconfig="$(tc-getPKG_CONFIG)"
+		myconf+=(
+			--with-systemd-suspend-resume
+			LIBSYSTEMD_LOGIN_CFLAGS="$(${pkgconfig} --cflags "libelogind")"
+			LIBSYSTEMD_LOGIN_LIBS="$(${pkgconfig} --libs "libelogind")"
+		)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}/etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index 7204b3a44923..843e9da8fdc2 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,6 +1,4 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
-DIST mrouted-3.9.5.tar.bz2 112746 BLAKE2B 146d088b0fe3691c48b86a5bb4fb191c6a138fcef065c2afb549e068181953bb5ec46a6d710b2f158ba9290f8b7cc8dd3314cafeb0d681a43419a69d2cda58e4 SHA512 6ab7335fd18bcb971eb0f9af26e8fd566b1bf2e53abdfcdea847c4bd719d282496c443914678c6fcbcf754e276663ed48ac9f0ae9e940e60eff71ceb1f4622fd
 DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
-EBUILD mrouted-3.9.5-r1.ebuild 841 BLAKE2B 4f26bdc8cb8fe714e058c15144ce651b09bd2f16cb4b3c9200c327b7e55e6c9b411b440df1511d3cbe156fcebafcaf92047124506e9b130f456457de1a5563dd SHA512 e45dd94d7e7ea511e7798c0a9f75b5fdff669d98b9cc00f272c153d2ce2ab37296c5605390bb9df115928de99f654b3ed17242619e8b5c1ce4f8c25d790ec725
-EBUILD mrouted-3.9.8.ebuild 1084 BLAKE2B cebd4e2a3f6709311c52158bf979f332e93b0c2ac6ee28af9955fcb0408129cb14d8060acb8dacebf29f17f52269fd38eda094c3d2ab77d1f61da76c2cc7d3ae SHA512 7b82b462480a3264d59c53cc2cb7988500982aca9738496bccec077a4c20a17063aa1d4f833b9681b2305e56afb04a0084658b5dc4acc1e05126c92ddebe1250
+EBUILD mrouted-3.9.8.ebuild 1081 BLAKE2B f6f973db6a7eb7e1a93998b58c2b8d9948a14682f9f6435fb25efe3f2dbcf44d3bfeb0e48332d3d9d66475f566dde4eaf27b4a5fe6395813a56cf2729a830798 SHA512 cdba5ee8434981a69ffe2b586b6f99febaf5f5ab948e995a458ac828f906e0af41ca5fc9e81268c2a5c312289c579152cf6799da673b73abd477692cd01b5865
 MISC metadata.xml 263 BLAKE2B cb359879b778e3cab54eb78f0d469b2acafd5dae71b337927dc91c871bc0b3477948813a77830721f9370c7c4e83f8aa0157eb29cb6a6548166028fe7564bbff SHA512 a671dd27602ae33831b300d8d25ee33335d220722d9004e5db3ef1d3f2bcf8646b4281f28a7a7baee9913e30a4f9699e5ae53233ddb8fcc11090162ab5945000
diff --git a/net-misc/mrouted/mrouted-3.9.5-r1.ebuild b/net-misc/mrouted/mrouted-3.9.5-r1.ebuild
deleted file mode 100644
index 68ce93661989..000000000000
--- a/net-misc/mrouted/mrouted-3.9.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="IP multicast routing daemon"
-HOMEPAGE="http://troglobit.com/mrouted.shtml"
-SRC_URI="ftp://ftp.vmlinux.org/pub/People/jocke/${PN}/${P}.tar.bz2"
-LICENSE="Stanford GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="|| ( dev-util/yacc sys-devel/bison )"
-RDEPEND=""
-
-src_prepare() {
-	# Respect user CFLAGS, remove upstream optimisation and -Werror
-	sed -i Makefile \
-		-e '/^CFLAGS/{s|[[:space:]]=| +=|g;s|-O2||g;s|-Werror||g}' \
-		|| die
-	default
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dobin mrouted
-	dosbin mtrace mrinfo map-mbone
-	doman mrouted.8 mtrace.8 mrinfo.8 map-mbone.8
-
-	insinto /etc
-	doins mrouted.conf
-	newinitd "${FILESDIR}"/mrouted.rc mrouted
-}
diff --git a/net-misc/mrouted/mrouted-3.9.8.ebuild b/net-misc/mrouted/mrouted-3.9.8.ebuild
index 74cff54b4c32..0e9bfcd0649a 100644
--- a/net-misc/mrouted/mrouted-3.9.8.ebuild
+++ b/net-misc/mrouted/mrouted-3.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.bz2
 LICENSE="Stanford GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="rsrr"
 RESTRICT="test"
 
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index 6df3739e1f91..8f9f2a21c146 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -7,5 +7,5 @@ DIST nemesis-1.4.tar.gz 144187 BLAKE2B 9b16fa37283e4a659312bbd24e5ab850cf11cbee9
 DIST nemesis-1.7.tar.gz 93423 BLAKE2B d46d19ae46852ea5a5f745b719779f3e4fbd77b918c8f53eaf743beb53d3ee345fa1663350d98095519481e819c5174fbe41b356da643b0aff9a2d5825494436 SHA512 6085cb91535c895325ca04e7583b29df9073731d8bee1d48ef46d09d25042d5220a73b2d02d77b4101de649877c0a2d0f4af5c06f125389fbd97c7350449134b
 EBUILD nemesis-1.4-r1.ebuild 626 BLAKE2B 0b7f3379705788d1873f67005011e0e6c8f54fa2ca7e96f22524ffc1ad67545e4e286991fd829db4a72bdfb0f9d22dad5ebdf93ff7537ffbc138e80490f9856a SHA512 d54b880507e5cfdc71fcc735d404758ffb9f466f1a633f410431ac2555b515238d35f76774ebf311f9378cddecd2c4feed9b1d00b596d36c1d7dde8756e652fc
 EBUILD nemesis-1.4-r2.ebuild 686 BLAKE2B 4379f65cdc3a45a0a9cf64f26e587e2591fbe9e50033ec5e525af5872e3485982d8c36ffaaabfc3031d3382b8c6c417e47ebb45582eaa8e66d3e2819e89e13e5 SHA512 ce6f875a66a18c5e4d0c7d2cb1774aceb6d10d7d17b6fc8d723715ae6a5c872ddd701b3709705148607ec14b1e08cbcd15e5ac4d1d781af0c38ee3420b01d2ce
-EBUILD nemesis-1.7-r1.ebuild 624 BLAKE2B a914021deacc4e92d24e8ca38754cf0525fd51b9dbd06e6243786700120d4e78de1e472eefc16868898e68b23b7da4feab788cf21792cd2f724b8db21bb66c38 SHA512 07ced0bdda5f237c5ae691c24d497c03ff62eae19a6a6f025c361466e8be244914d25eaa577a7b0c7c9a3558bd80eef4300e245eb386a042ed30345d5f4b8f66
+EBUILD nemesis-1.7-r1.ebuild 621 BLAKE2B e8f84d0a6a5dd4efffeeb7ceea943a3d878df025f35ccd3ad502d684ffb3ebc53973cdda9b5b0ae3ed20acacf65ed348450a8e9a9251ecb658b80c53c2968ba9 SHA512 b7662484bcf4972674959f532e5468ecef8e025c5e7ab19fef91e323a4c20532689113087e00a4dda28722751eacb1e482397a092591c501b4514684a5f091fd
 MISC metadata.xml 291 BLAKE2B 41178dcbae1f81d0bc5a8cfaacce0d5bdf65648775430d1b8828e3875e7322c7de7537983852485f3a091380a72b964e82f4cac91dc2281f1291662abfacd72a SHA512 7e39bc9868b0b6603f3a48d7905f47745656f96334e6fbaa66e314a6dbfb0c63e1ba33cbbc63fc61f8289fb756105dfd6cf9b990c113a8569a9997af29d2c2dc
diff --git a/net-misc/nemesis/nemesis-1.7-r1.ebuild b/net-misc/nemesis/nemesis-1.7-r1.ebuild
index f34383cb354c..a30a9179686c 100644
--- a/net-misc/nemesis/nemesis-1.7-r1.ebuild
+++ b/net-misc/nemesis/nemesis-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libnet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 sparc x86"
 
 RDEPEND="
 	net-libs/libnet:1.1
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 7e0e2c539b5f..959e41e396d0 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -1,6 +1,10 @@
 AUX netifrc-0.7.1-dhcpcd_args_tempfile.patch 2079 BLAKE2B 443a4a9e68b63cb85060ade03f916b827ae9708714bb6ba6beac19568b3dcab66bebfca450381c394478168c3e857ffc91b566b792a9d9b4c84d620ca94ed0b4 SHA512 04cbe1c525f0a81883c0058625a629929f1904ba97e41629f0c3ef4d1a3998daeff65b98fa37e03443159c9d9392a848f1c754499c1b2033d8f4789a2c9d14e4
 AUX netifrc-0.7.1-dhcpcd_pidfile_location.patch 1580 BLAKE2B c1fa6aeedf5964b41a0629985633085c8aef6812b6f5ce09dc9901f1687a05de5962ab14cd7ed53d0d9e200dd4f20cdf31439921185f314c27f61bada2294658 SHA512 b1134c2dc7d3b99d200d3314905446482af8dcd8cf53775978665c8ea930d04b10f36804f4d5ef1d3e020db450114800494fdbfb076ce98e76759e78d53bdb26
+DIST netifrc-0.7.1-patches-01.tar.xz 3356 BLAKE2B 35d34456af5fcb8ac35c80db13484b7b4712543e95441e6be4274934627216879ae6c8421ca2ef0b67a92ab39befb03a4b171a51a54e0e14c10bb6323cfaa4e9 SHA512 340cf6184196ee9648565cd2c652cd56eaab4f3f765baff889f736cca05a5ca12a63de5d864c0f9fedc9337f88fd25dac0224118dab39ce7542cd0977f40db6f
 DIST netifrc-0.7.1.tar.gz 82393 BLAKE2B a1d147db2a4e4ff7d360bf5140ccf060283dbcbfde7100f1d193c783f1da540574e1342b4d7f3f9ee011628f9f113fc751416805f35678a1093e0cc0014f5eb9 SHA512 407071f8f58b7788703a62193677673ddd18114b69142894674337410473e620cf3895bb014cff133f719ac1a7191ac3bedfd969c9a11bf2f1c4b04d39683057
+DIST netifrc-0.7.2.tar.gz 84332 BLAKE2B ba379f34a7986f75f73f291ad69dff2b58036eb439ba8610f5fbddc3d1df9430e0560683477544f11bcd4fb2dd662ed09ab0797a9ce9f734f4b5dcf5db8006c8 SHA512 1d588b638331b3822e9c7ff7f6118a540f20366a662ebf4d05c4c1794536fcb5ee25b57e8cf7b631d90788883c3b405d5b9ac460443d5184216d805f956df07e
 EBUILD netifrc-0.7.1-r1.ebuild 2162 BLAKE2B 0cfb264306fdbc6e395db9f7ad812bf4d641ca171b5d03a35075ae42f4088f5792d2ac8774a44e541f6bf5adcddf9638b03c3e793aac032f4385428bbf0779e6 SHA512 4704087f4945899e1e729f12f8517b9e17e9eaf626ba6ef17b28dea54702b759a41b133f49d0f6aef9e782e2a2a84b3b13ef977addb28722c3fd997f3347d2ec
+EBUILD netifrc-0.7.1-r2.ebuild 2150 BLAKE2B f59f860df7863caae5bb6dccb875ee69f07eadfe8daecc8cd2e6a950f065f066f07851e430206dda368534bf895b9adc140dd1903aefe70df8ff5f467a734e03 SHA512 b84e81bb7e9ccdb1bf0dbe9e120bffc021075ff93adf886d2a9ac6c47ce5cf2c4103dabe3735ea008becb7079fbd056ff418f514739c796f182a4b75f82ac8be
+EBUILD netifrc-0.7.2.ebuild 2047 BLAKE2B 64858661488665f75d13d3a5ecad330f45ed7dc6716dc7259d70053f618f0839eb25a830651af522223664be04f7e5ddce2ecfd1e0cfaa2d38691c0bd2fd2202 SHA512 fb050a6c9058eb08624c838a5d3ec5c10c0ee1f7fbd08d6a0234ebf3e8be75cef9f781372a6eecea080e6c9ab886054b384fae6b00c59e99973eaf31ee8d3618
 EBUILD netifrc-9999.ebuild 2047 BLAKE2B decbe78b5ac86f957ee27f203b0af14d8e4e022bc326891b5f990849c5817e9fec3a07ad0409fd3619b07a3a3683fbf6c9aef8f0c39f378a7e7276a7a5c6e80a SHA512 0b3d9ea722a45d91a9edc38616ee239910df1c8bf8c5ada1e75f78842c07e89756da519e46132cabd18b705b51c52a3dabfa3ed8ef196e156e34364ec8733a23
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.7.1-r2.ebuild b/net-misc/netifrc/netifrc-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..a4939169d562
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.7.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-patches-01.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	eapply "${WORKDIR}"/patches
+
+	default
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+	# Install the service file
+	LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	UNIT_DIR="$(systemd_get_systemunitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/netifrc/netifrc-0.7.2.ebuild b/net-misc/netifrc/netifrc-0.7.2.ebuild
new file mode 100644
index 000000000000..0e9cf97453c8
--- /dev/null
+++ b/net-misc/netifrc/netifrc-0.7.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd udev
+
+DESCRIPTION="Gentoo Network Interface Management Scripts"
+HOMEPAGE="https://www.gentoo.org/proj/en/base/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/netifrc.git"
+	#EGIT_REPO_URI="https://github.com/gentoo/${PN}" # Alternate
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="!<sys-fs/udev-172"
+RDEPEND="sys-apps/gentoo-functions
+	>=sys-apps/openrc-0.15
+	!<sys-fs/udev-init-scripts-27"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+		einfo "Producing ChangeLog from Git history"
+		GIT_DIR="${S}/.git" git log >"${S}"/ChangeLog
+	fi
+
+	default
+}
+
+src_compile() {
+	MAKE_ARGS="${MAKE_ARGS}
+		UDEVDIR=${EPREFIX}$(get_udevdir)
+		LIBEXECDIR=${EPREFIX}/lib/${PN} PF=${PF}"
+
+	use prefix && MAKE_ARGS+=" MKPREFIX=yes PREFIX=${EPREFIX}"
+
+	emake ${MAKE_ARGS} all
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+	dodoc README CREDITS FEATURE-REMOVAL-SCHEDULE STYLE TODO
+
+	# Install the service file
+	LIBEXECDIR="${EPREFIX}/lib/${PN}"
+	UNIT_DIR="$(systemd_get_systemunitdir)"
+	sed "s:@LIBEXECDIR@:${LIBEXECDIR}:" "${S}/systemd/net_at.service.in" > "${T}/net_at.service" || die
+	systemd_newunit "${T}/net_at.service" 'net@.service'
+	dosym "${UNIT_DIR#${EPREFIX}}/net@.service" "${UNIT_DIR#${EPREFIX}}/net@lo.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}"/etc/conf.d/net && -z ${REPLACING_VERSIONS} ]]; then
+		elog "The network configuration scripts will use dhcp by"
+		elog "default to set up your interfaces."
+		elog "If you need to set up something more complete, see"
+		elog "${EROOT}/usr/share/doc/${P}/README"
+	fi
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e096d09dc410..da4fd510101b 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -9,9 +9,11 @@ DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7
 DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328
 DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64
+DIST NetworkManager-1.28.0.tar.xz 5129848 BLAKE2B 37dc9cda283dad29a70c85ed41a77844b4f60a9815be4b6780fbefecfeffb644fd67ea65373a1895fd2102f2beec9ad141b6e9a92a1a32de646d64acd4250b62 SHA512 ab0bc39626dc55df4e122ad6e1a8086e1467f44bdd41c4491c752dca3ffb549796e0ac888041f12f661f2f6cf4142d0fce59b5135549e48a0076fafcdc45ca06
 EBUILD networkmanager-1.22.10-r12.ebuild 8550 BLAKE2B 2bc90b456b46a5240e05c52a6afe59b4320d905363a3bad0ae4d0f41e3d0584d2743a76c255be198cc0dffacfd29109deb59d67749b06423e3155c1f624c9150 SHA512 00e785287a1ff4cf9260b8cb5d342ead2c1e3568095d5a7074b72df8269940a46e257b95f36a335055ec3de17de8fae527b99434253dd06d1bc04e0108b0e1f0
 EBUILD networkmanager-1.26.0-r1.ebuild 11208 BLAKE2B f69905ebe2031f6e707c9c1907e03f0c80fdb2546bec7964a9b21b3a8a6008c023a630e9cfbca5cef00ff937056d816755d62884428fc972814ac67cee755a51 SHA512 40009fa98e7a6317d87a22e8ab559e70d229bdbd0bfc91e49cfcff36f5bc551d86d16f9fdd2e52e3e2821123dd47eb4e3efb0a79d873a91d34eefcbaf9c50e2d
 EBUILD networkmanager-1.26.2-r1.ebuild 11214 BLAKE2B b9bf75442380146f2b7eb73f8022cbd30eaecb47e9f48ab96300e26471ecfa1949f076749b23604cc8c5b34264858788cf638c74221bbc5bef2d04e0f219e19d SHA512 eb92e2db85fb28e961494c6425eab2f3a03d61c4efa94d5cdbf1393b7f4d90e55b6cc958f2ec7c0079250f8a51827d42a477ec459bffaa508e6817f4ab8c0d12
 EBUILD networkmanager-1.26.4.ebuild 11354 BLAKE2B e76905e2e9d0fb3e2215585242b704a3f01f7a287749a88c23b866a643ea5d6c090e5328d70691b778fcbd381e9303256588a59d6f21041b07479f600c00980e SHA512 c5830f50416a0eb83d4bb884f6fa0fe9777a489b4f2f3ec159bfd89e3521c6ea2fd44d6ed865ae623a68acdd51bc9ecf583d90e42d97cef8e4ef5fd119dcea74
 EBUILD networkmanager-1.26.6.ebuild 11359 BLAKE2B f129d1aa0f60a115786e6833fd6cfa43f7b28174fd83cf74c09db9fb69222235e2a424ea8a0993bf4ca14dd24f5e942961f2780a1fdb6806a0ead0f616a6fae7 SHA512 2568a02a564e5be9135880e6e80d587eae81fccbf1469c78830f3580da69ab02d6090a0371697919d39082da6ef50c6a35aeb1318fa7c25a1159c321767a677c
+EBUILD networkmanager-1.28.0.ebuild 11194 BLAKE2B 8da159c9aab4f097f47e02ff3b5742afb9b3d667aa053d54fe9d342f8e6f8a7acceeaa26827bdb51991abc3c42b17f5fd6dbb2e3ee2098fcaa9939c8da0ddb6a SHA512 9448c3ee69ef0790733524e932d1f134f4dc11660cf5489442d45ed2e92cc45964dc52c94d9af47e696b08873547b376e511854d71d48cf9cb6a4755dd5ba2c7
 MISC metadata.xml 2182 BLAKE2B 699e4c087f213e132e3787d7c2f913b23bf79f4fb78037bd92510de0655863eb7ad2148a615b68b84ad14309624c25802bcbf65ee3052a6b84d20d2b8657bae6 SHA512 f8fbb50dbe481b3530e8ac6446c43e385095f04ad36c33a3ac73964675468b0d4cf47eab8698bc338d5fabc1f9f9ad2ad99edffac69aace897c88fa88f1dcfe3
diff --git a/net-misc/networkmanager/networkmanager-1.28.0.ebuild b/net-misc/networkmanager/networkmanager-1.28.0.ebuild
new file mode 100644
index 000000000000..58a738efe185
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.28.0.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="NetworkManager"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.18
+	"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index f6bcfb7bde96..414b749b072b 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,12 +1,7 @@
 AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
-DIST nextcloud-client-3.0.2.tar.gz 19114545 BLAKE2B a6aa041708d110fbdca082476e65ccc8fec189948aa64020a27beabe2d7b3df474ae3313b5aef0e15f3498cf974cf414eb4934417cea206b021e4e212351a088 SHA512 188f878457baba14f01ca6c0f83100bcc64feaf5e3da86903d59d8b7c553c89f88252c1410cd153952950f91429af680b1901f3f9de951bfd06a06c176d44e7d
-DIST nextcloud-client-3.0.3.tar.gz 19202718 BLAKE2B b5e09be514ede6e323e9624df38aad10969c0fdae7bc7baaeb9da4628dfa1c44a4fb6b5f6b4b83ff92b0eedbbe1ffbcf54da43d5e71923979b8649db54b05d7c SHA512 aa9e9897dae74919f11817f8aad139378a2a26df6663f3c9ee9c9e1d229b537daa9e9ed9f3ba292f8e299017f7ef5d863257a26858af159e7e76c7247d7c244d
-DIST nextcloud-client-3.1.0.tar.gz 19265221 BLAKE2B a065c1498d20b3b7ae3ca1c6b85cf81685b237a5c469aa2e01a1e0c0365c1e64db89758d7cba204035a034fb1357b7644545345fd4b98a6a88f0e5458357c206 SHA512 26c886f933fbed944b5a587dff43f3e56edfa7d36f4b0200ea1a77b0e1c28db22794ac00dbe5577d2299d733dc23c2ff7061d6a8a679bd0948431aaacd40d5f5
 DIST nextcloud-client-3.1.1.tar.gz 19440799 BLAKE2B ae6ef7fbff4b7b5c9a5728a30558000cd781348dd07aba068af5b123ec629e1661b52cd63b50bf45c593411866bc607dfcc3112713fa2aea3eabfda7ce969614 SHA512 1f60266ff6d413a614261ae8b6c75ba6bc5cdb534f1906039b47cb7d593d12d72013d277dc12c0bfc5c5919322438543736a7cdff056949d80e093538fd04209
 EBUILD nextcloud-client-2.6.5.ebuild 1951 BLAKE2B bbb143e83a235f27cdd65c5cbbeb3b4bf40938a79e9295802f9d892609c5980ccde188d88a1b482295a40be96e856bce9e4d615dbd93cb65aefc4904924216e6 SHA512 0e1567e43e28299f27c633d7c828a1422aeea689f46422fb10a6a80ae02d4b75dec6542460d86d800fdb9c2dfcf4815a2c69575ecc5db8ff9ab3e863ab0120b6
-EBUILD nextcloud-client-3.0.2.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
-EBUILD nextcloud-client-3.0.3.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
-EBUILD nextcloud-client-3.1.0.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
+EBUILD nextcloud-client-3.1.1-r1.ebuild 2040 BLAKE2B 2d84e53fda3603204bd8fd87dfd7a85d5cd878988209438514dfa313853b1f9a131de4590781629ca4cff3436656a4c2dcc831a2cc91ebbea73eb4c3544cf0e8 SHA512 2de9f51dae3e56c1e1e6f1ba9cc0947864061789b5ede9955a751a2f865a7a5675ecb605958e6db77bcec9ebea42e381809af7df1e60d02829f420e410b05134
 EBUILD nextcloud-client-3.1.1.ebuild 2026 BLAKE2B fef80cedfb47931d0a53f834f05b6faf705d1d5281711b55a4e944ba533ec5fec2d10b6d49bf611204fda8fd09091ba5197166005566e27abbce181345deee0a SHA512 a4565a69fb607ac5181492ea056fe65432c4c5b439c997991d7e14ae8cc482dd43f16442035949464c8d22e8dc1c5b29d217ea025579d8272b56c5f5ae454425
 MISC metadata.xml 513 BLAKE2B d5a3d3a3faf76e1c3dd481e295deea3ce56d8bca523229e2e68942bc268a09e22221efd27c1dec2decaaf999992600fb0a039ccdd376bbe9a70c55879a09221c SHA512 7b3888d4f38948547620650c253e511772de59d259fb1a9211f88ce2612a6373838820e3827ebda5d2f8ff969ec3851dea30512fd433b87480b27f49da8738fb
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
deleted file mode 100644
index a3dd780f6e5f..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin libressl nautilus test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-	libressl? ( >=dev-libs/libressl-3.1:0= )
-	nautilus? ( dev-python/nautilus-python )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/desktop-${PV/_/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=yes
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.1.1-r1.ebuild
index a3dd780f6e5f..f05da2618590 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.1.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin libressl nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
+	dev-libs/qtkeychain[gnome-keyring,qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 9e3e1e99ff06..ab1684dc1f68 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -6,6 +6,7 @@ AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9
 AUX ntp-4.2.8_p12-libressl-2.8.patch 741 BLAKE2B 8b5542b216710da46a59d2cefa82142bfe1590ca351833c5a3b91fd3c14c37ddfbcee89aa819a9b254f3ba9f3ef8997aa81c881fc04a71da0c2bb1e727be5215 SHA512 4b8e2b79c0922a5a2d9eb1857679996fffc0dc807e01221c0b5be7a547fe700f715899d66f946a6626848bca89973b807b3b171b7cc3ae153d238a2da64f49e1
 AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f
+AUX ntp-4.2.8_p15-gcc10.patch 2019 BLAKE2B df64e28c70d7aa1cf2513b594dc5f79f0be862c6dd0ba3e3e75e6bce394eeaff2bd994e65ad4435d212bd1b2c406e49e587c72a6c8f9fc1f63fa166dac717844 SHA512 15f2756c1ac370f4896ffc1d8bd340bb7c09869c47a78edc66da855855c9dca0adeef0e03d262ace9c7ae408c2bcb080d6e01e4fc32783518fb8db28b08200b7
 AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6
 AUX ntp-client.rc 720 BLAKE2B 5662d2f6635b8d5bb07fbc82c259a8af7871b8312ebff0184005d3ea24f239a1d3e2b63a5a7e9eef8f385a72fcd9370a2e68031a7c54bf3ef28e8c26c97c0298 SHA512 557cb44fc911dcf34d21227c5d92c2ab56ca3fd855a5d2715c5f7343ae45a91c4b5492a84ac01a712bc251ea2a83810f4eb33e467b456b42c79052454a68dc81
 AUX ntp.conf 1614 BLAKE2B 88158ad4270a7b3f42de7d3dcaa5a2dc5f7900171c0259834ff781372bdb0e6b06d46c009890a0a2ab4b60b6759bc650324994a2b81ef9b9d0bc922047add9bc SHA512 b21afb9d2b9302edf702fce536218fa916e810e916c207dd6f2f09a9a793a465bc929b9a36108d49ddb3552e221b57cbb2e9f916eba78662b19c4b9c2b3e806c
@@ -20,5 +21,5 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028
 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794
-EBUILD ntp-4.2.8_p15.ebuild 4536 BLAKE2B 135904238aaf08926b34bafce7deeee42ad0d523267ffad188638d2b73f8c671eac9dfa5c7e48bb821913ece01c8d5ffb405fbefc51d96d512503fdeecca4065 SHA512 96cc39f67200d3ad26c552665af565e5a62aacbd6441f524af4abe1847c763861c7cdfe32027e3c4d4317b86b670f45819572867c7ce5388e89d1d9e12d82787
+EBUILD ntp-4.2.8_p15.ebuild 4587 BLAKE2B f2a0323a230697b6eea522ef4cc0526478b6d25a6b3af5a600f812014cb6943eaa2cf642d7f17d3baeb083f4821157b347749b2523332cf3659ac9f96ef26822 SHA512 7a64a10afb9483d2cf1527b17b659b521b188cb21d9576cb2fc8ab672858d3b5ded6edbb705f551de6fa4528a9b7109e6c6a72633b4543a57e39d4831c68278e
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch b/net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch
new file mode 100644
index 000000000000..619ea07558c2
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8_p15-gcc10.patch
@@ -0,0 +1,75 @@
+
+Source:
+https://bugs.ntp.org/show_bug.cgi?id=3688
+
+Juergen Perlinger 2020-12-24 07:10:49 UTC
+Created attachment 1760 [details]
+ultimate patch, v00
+
+--- a/sntp/log.c	2020-12-24 08:02:05.206004072 +0100
++++ a/sntp/log.c	2020-12-24 08:02:05.206004072 +0100
+@@ -2,7 +2,7 @@ 
+ 
+ #include "log.h"
+ 
+-const char *progname;		/* for msyslog use too */
++extern const char *progname;		/* for msyslog use too */
+ 
+ static int counter = 0;
+ 
+--- a/sntp/main.c	2020-12-24 08:02:05.210003956 +0100
++++ a/sntp/main.c	2020-12-24 08:02:05.210003956 +0100
+@@ -20,7 +20,6 @@ 
+ #include "log.h"
+ #include "libntp.h"
+ 
+-
+ int shutting_down;
+ int time_derived;
+ int time_adjusted;
+--- a/sntp/main.h	2020-12-24 08:02:05.210003956 +0100
++++ a/sntp/main.h	2020-12-24 08:02:05.210003956 +0100
+@@ -16,6 +16,14 @@ 
+ 
+ #include "crypto.h"
+ 
++/* !Attention! 'progname' must de instantiated in any program that wants
++ * to use this library.  Putting it into the library breaks a lot of
++ * things, since many programs define it itself and then the symbol
++ * might end up twice in the linker.
++ */
++extern const char * progname;
++
++
+ void	set_li_vn_mode(struct pkt *spkt, char leap, char version, char mode); 
+ extern int sntp_main(int argc, char **argv, const char *);
+ int	generate_pkt(struct pkt *x_pkt, const struct timeval *tv_xmt,
+--- a/sntp/sntp.c	2020-12-24 08:02:05.210003956 +0100
++++ a/sntp/sntp.c	2020-12-24 08:02:05.210003956 +0100
+@@ -2,6 +2,8 @@ 
+ 
+ #include "main.h"
+ 
++const char * progname;
++
+ int 
+ main (
+ 	int	argc,
+--- a/sntp/tests/t-log.c	2020-12-24 08:02:05.210003956 +0100
++++ a/sntp/tests/t-log.c	2020-12-24 08:02:05.210003956 +0100
+@@ -3,7 +3,6 @@ 
+ #include "ntp_types.h"
+ 
+ 
+-//#include "log.h"
+ #include "log.c"
+ 
+ void setUp(void);
+--- a/tests/libntp/test-libntp.h	2020-12-24 08:02:05.210003956 +0100
++++ a/tests/libntp/test-libntp.h	2020-12-24 08:02:05.210003956 +0100
+@@ -5,4 +5,4 @@ 
+ 
+ time_t timefunc(time_t *ptr);
+ void settime(int y, int m, int d, int H, int M, int S);
+-time_t nowtime;
++extern time_t nowtime;
diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild
index 7864b4189d44..1405367f2d42 100644
--- a/net-misc/ntp/ntp-4.2.8_p15.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
 	"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530
+	"${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409
 )
 
 src_prepare() {
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 5e3cd3c204f6..5c9d4837f294 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,11 +1,3 @@
-DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
-DIST nx-libs-3.5.99.22-full.tar.gz 5280116 BLAKE2B 1a15ba04ace5fd46b007652897aa911a883fa2840c07f4e89db970d3235556ee83600f5cd4d9c4b64f7ce4767dd448a3654412051496754d73a2815a7573692f SHA512 53e7f1ffd8bf9dfd08426e30b0a18433b64f926959ab95132c28960f9a2390e67a34b1e07c923bf11f889088711d7d97c1fd123507f39c2077211d2c3cd6857f
-DIST nx-libs-3.5.99.23.tar.gz 11073366 BLAKE2B 0e06e9c90f73a0264d8363ee3f75914ada884f469d9ba15b062675625a9922be5ec963eb7611484ef2abea83a100e58b05e6421da67d8b5c5f840737e6b37321 SHA512 b627d521f7a3c43c9c000f770bd1e228842099e794cda32b37df621ac86c650990bdc69810b7ff6117cbd60f0339dda93d1e2acdcfac03ddaa50407d71668b60
-DIST nx-libs-3.5.99.24.tar.gz 11059384 BLAKE2B 79879991c2c0127e43975d42a27159594e3be29b2e358576da4bdc17ef1dc0c27a31c85b12a8c55638abb99db9f7f1fad4f4d8794c01e1327a5cb68558073fc0 SHA512 755f9065da69f0057a7284eb80f214cd272c6753f32ddaa17b4258c6ccba77c8fec82eafaea87bd3e055610dc798cb141d8e947900ad3bad34c681df664df3b2
 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
-EBUILD nx-3.5.99.16.ebuild 3118 BLAKE2B cd118b671a1b57c7ceae369431e8b23a214104bd790914d735b118e2e7d9487b096b4a08792a4006572362f0bac78015c1f868092186c22ac21d9e829674df64 SHA512 42b58a02ccba22d17b2862ea85923e8fc7f6834c667b31afcd1399d66cb21f9e6a33f98b48973305d342b6cf406504cd41a545a046a2708d77d6741d441773a5
-EBUILD nx-3.5.99.22.ebuild 3243 BLAKE2B 96efb3e409b0e6253efcc1914ae5bf5d1020999e682a729dee71c188126aed73b9abbbf62b1cfae46427c1a65c0365c94e5d321c825b4775df0b5a06ff17ffd6 SHA512 159ee29ca7dc9a1d8ee12ee5fea8a10a0bb1ac28762d08208dc15b547e8d4d15b06de001e13f36c8648c193155ba1865f02d05be7d8bf25b228f889fd509711e
-EBUILD nx-3.5.99.23.ebuild 3392 BLAKE2B 676f533494f67fe8285db1d5a4ddd715c58ae7ce78d4cf7e4bc63d330709735c1d814426cdf80303a6420686deed5be75d3d82b2d0fc65fc4e9b04052207890a SHA512 a4020facae074b7f123c165e2009d4c1b7dcf3e33c2b1917dbfd80fc5d210c0cc93886158cfc4fb8153752a9e368910bfb750eab4a43b182581c9b4645a8aa56
-EBUILD nx-3.5.99.24.ebuild 3263 BLAKE2B 586b19ad301450226ad97666e6f8f3f07cd060f8778c1437c863876af725e29811910508345300b400cb4513861295f0f09b81fc5768f2d3452e968f2b3b3b05 SHA512 0372380455f94e9aa723c00793836b47671c6d184afd640a7a39120d6de2df54c9b0fd80577a426a460d24bd7e21541d5cab7b43b7d6c70d9113d85748776364
-EBUILD nx-3.5.99.25.ebuild 3263 BLAKE2B 586b19ad301450226ad97666e6f8f3f07cd060f8778c1437c863876af725e29811910508345300b400cb4513861295f0f09b81fc5768f2d3452e968f2b3b3b05 SHA512 0372380455f94e9aa723c00793836b47671c6d184afd640a7a39120d6de2df54c9b0fd80577a426a460d24bd7e21541d5cab7b43b7d6c70d9113d85748776364
+EBUILD nx-3.5.99.25.ebuild 3261 BLAKE2B e1af6432005e148a7a51435e2eb1d8ef1178935f6a302b3877978c1235741bf869569c7683f61a8ec45d40f040609ccf128448fbb39373f2a98e1e575bfff937 SHA512 5483a5084b78ed3ee751de714198d6ec2e1fd51ab754400adc9559be73d48035904aa3558a824d33e98e9289377543587a94daf48328ef0237f447844aca3c61
 MISC metadata.xml 332 BLAKE2B 93930f64047301f8a393899de54a0d9294c7c17385b47fec5a2e402b2904bc88ae697e5b075e1defd723d8d251fd424e790e9b37b94bc48b10b395307e3830fd SHA512 005c90731093f7fc354297e981140415e33785492a1a835a5a5b8b68506d690679d6430ff0b05f6e3ce2ac763ea13cd68a599581a6037f16ac1974e6ad9d54a4
diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild
deleted file mode 100644
index ac90bff91f82..000000000000
--- a/net-misc/nx/nx-3.5.99.16.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="elibc_glibc"
-
-RDEPEND="
-	dev-libs/libxml2
-	>=media-libs/libpng-1.2.8:0=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXfont2
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pixman
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libfontenc
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-S="${WORKDIR}/nx-libs-${PV}"
-
-src_prepare() {
-	default
-
-	# We want predictable behavior. So let's assume we never
-	# have quilt installed.
-	sed 's@which quilt@false@' -i mesa-quilt || die
-
-	# run autoreconf in all needed folders
-	local subdir
-	for subdir in nxcomp nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		eautoreconf
-		popd || die
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	pushd nx-X11 || die
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-	# Disable SunRPC, #370767
-	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
-}
-
-src_configure() {
-	local subdir
-	for subdir in nxcomp nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		econf
-		popd || die
-	done
-
-	pushd "nx-X11/lib" || die
-	econf --disable-poll
-	popd || die
-}
-
-src_compile() {
-	# First set up the build environment
-	emake build-env
-
-	# We replicate the "build-full" make target here because
-	# we cannot call "make build-full" as it
-	#  - calls autoreconf several times
-	#  - invokes make directly but we prefer our emake
-
-	emake -C nxcomp
-	emake -C nx-X11/lib
-
-	mkdir -p nx-X11/exports/lib/ || die
-	local nxlib
-	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
-		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
-	done
-
-	emake -C nxcompshad
-
-	./mesa-quilt push -a || die
-
-	emake -C nx-X11 BuildDependsOnly FONT_DEFINES="-DHAS_XFONT2"
-	emake -C nx-X11 World USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" SHLIBDIR="/usr/$(get_libdir)" FONT_DEFINES="-DHAS_XFONT2" XFONTLIB="-lXfont2"
-
-	emake -C nxproxy
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr" \
-		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
-		SHLIBDIR="/usr/$(get_libdir)" \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		install
-
-	# Already provided by mesa & related packages
-	rm -r "${ED%/}"/usr/include/GL || die
-
-	# Get rid of libtool files and static libs.
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/nx/nx-3.5.99.22.ebuild b/net-misc/nx/nx-3.5.99.22.ebuild
deleted file mode 100644
index af1c30b085fa..000000000000
--- a/net-misc/nx/nx-3.5.99.22.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
-
-SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="elibc_glibc"
-
-RDEPEND="
-	dev-libs/libxml2
-	>=media-libs/libpng-1.2.8:0=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXfont2
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pixman
-"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libfontenc
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/nx-libs-${PV}"
-
-src_prepare() {
-	default
-
-	# We want predictable behavior. So let's assume we never
-	# have quilt installed.
-	sed 's@which quilt@false@' -i mesa-quilt || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
-
-	# run autoreconf in all needed folders
-	local subdir
-	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		eautoreconf
-		popd || die
-	done
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	pushd nx-X11 || die
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-	# Disable SunRPC, #370767
-	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
-}
-
-src_configure() {
-	local subdir
-	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		econf
-		popd || die
-	done
-
-	pushd "nx-X11/lib" || die
-	econf --disable-poll
-	popd || die
-}
-
-src_compile() {
-	# First set up the build environment
-	emake build-env
-
-	# We replicate the "build-full" make target here because
-	# we cannot call "make build-full" as it
-	#  - calls autoreconf several times
-	#  - invokes make directly but we prefer our emake
-
-	emake -C nxcomp
-	emake -C nx-X11/lib
-
-	mkdir -p nx-X11/exports/lib/ || die
-	local nxlib
-	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
-		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
-	done
-
-	emake -C nxcompshad
-
-	./mesa-quilt push -a || die
-
-	emake -C nx-X11 BuildDependsOnly
-	# Parallel make issue resurfaced, upstream working on autotools switch
-	emake -j1 -C nx-X11 World \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		SHLIBDIR="/usr/$(get_libdir)"
-
-	emake -C nxproxy
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr" \
-		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
-		SHLIBDIR="/usr/$(get_libdir)" \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		install
-
-	# Already provided by mesa & related packages
-	rm -r "${ED}"/usr/include/GL || die
-
-	# Get rid of libtool files and static libs.
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/nx/nx-3.5.99.23.ebuild b/net-misc/nx/nx-3.5.99.23.ebuild
deleted file mode 100644
index 55b6eb9d8316..000000000000
--- a/net-misc/nx/nx-3.5.99.23.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
-
-SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="elibc_glibc"
-
-RDEPEND="dev-libs/libxml2
-	>=media-libs/libpng-1.2.8:0=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXfont2
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pixman"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libfontenc
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-S="${WORKDIR}/nx-libs-${PV}"
-
-src_prepare() {
-	default
-
-	# We want predictable behavior. So let's assume we never
-	# have quilt installed.
-	sed 's@which quilt@false@' -i mesa-quilt || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
-
-	# run autoreconf in all needed folders
-	local subdir
-	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		eautoreconf
-		popd || die
-	done
-}
-
-src_configure() {
-	# Workaround until fixed upstream
-	# https://github.com/ArcticaProject/nx-libs/issues/907
-	append-cflags -fcommon
-
-	# From xorg-x11-6.9.0-r3.ebuild
-	pushd nx-X11 || die
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-	# Disable SunRPC, #370767
-	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
-	popd || die
-
-	local subdir
-	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		econf
-		popd || die
-	done
-
-	pushd "nx-X11/lib" || die
-	econf --disable-poll
-	popd || die
-}
-
-src_compile() {
-	# First set up the build environment
-	emake build-env
-
-	# We replicate the "build-full" make target here because
-	# we cannot call "make build-full" as it
-	#  - calls autoreconf several times
-	#  - invokes make directly but we prefer our emake
-
-	emake -C nxcomp
-	emake -C nx-X11/lib
-
-	mkdir -p nx-X11/exports/lib/ || die
-	local nxlib
-	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
-		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
-	done
-
-	emake -C nxcompshad
-
-	./mesa-quilt push -a || die
-
-	emake -C nx-X11 BuildDependsOnly
-	# Parallel make issue resurfaced, upstream working on autotools switch
-	emake -j1 -C nx-X11 World \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		SHLIBDIR="/usr/$(get_libdir)"
-
-	emake -C nxproxy
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr" \
-		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
-		SHLIBDIR="/usr/$(get_libdir)" \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		install
-
-	# Already provided by mesa & related packages
-	rm -r "${ED}"/usr/include/GL || die
-
-	# Get rid of libtool files and static libs.
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/nx/nx-3.5.99.24.ebuild b/net-misc/nx/nx-3.5.99.24.ebuild
deleted file mode 100644
index f910dec05f09..000000000000
--- a/net-misc/nx/nx-3.5.99.24.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools toolchain-funcs
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
-
-SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="elibc_glibc"
-
-RDEPEND="dev-libs/libxml2
-	>=media-libs/libpng-1.2.8:0=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:*
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXfont2
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pixman"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libfontenc
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-S="${WORKDIR}/nx-libs-${PV}"
-
-src_prepare() {
-	default
-
-	# We want predictable behavior. So let's assume we never
-	# have quilt installed.
-	sed 's@which quilt@false@' -i mesa-quilt || die
-
-	# Do not compress man pages by default
-	sed '/^[[:space:]]*gzip.*man/d' -i Makefile || die
-
-	# run autoreconf in all needed folders
-	local subdir
-	for subdir in nxcomp nxdialog nx-X11/lib nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		eautoreconf
-		popd || die
-	done
-}
-
-src_configure() {
-	# From xorg-x11-6.9.0-r3.ebuild
-	pushd nx-X11 || die
-	HOSTCONF="config/cf/host.def"
-	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-	# Respect LDFLAGS
-	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-	# Disable SunRPC, #370767
-	echo "#define HasSecureRPC NO" >> ${HOSTCONF}
-	popd || die
-
-	local subdir
-	for subdir in nxcomp nxdialog nxcompshad nxproxy ; do
-		pushd ${subdir} || die
-		econf
-		popd || die
-	done
-
-	pushd "nx-X11/lib" || die
-	econf --disable-poll
-	popd || die
-}
-
-src_compile() {
-	# First set up the build environment
-	emake build-env
-
-	# We replicate the "build-full" make target here because
-	# we cannot call "make build-full" as it
-	#  - calls autoreconf several times
-	#  - invokes make directly but we prefer our emake
-
-	emake -C nxcomp
-	emake -C nx-X11/lib
-
-	mkdir -p nx-X11/exports/lib/ || die
-	local nxlib
-	for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
-		ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
-	done
-
-	emake -C nxcompshad
-
-	./mesa-quilt push -a || die
-
-	emake -C nx-X11 BuildDependsOnly
-	# Parallel make issue resurfaced, upstream working on autotools switch
-	emake -j1 -C nx-X11 World \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		SHLIBDIR="/usr/$(get_libdir)"
-
-	emake -C nxproxy
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr" \
-		NXLIBDIR="/usr/$(get_libdir)/${PN}" \
-		SHLIBDIR="/usr/$(get_libdir)" \
-		USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
-		install
-
-	# Already provided by mesa & related packages
-	rm -r "${ED}"/usr/include/GL || die
-
-	# Get rid of libtool files and static libs.
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild
index f910dec05f09..2da4b0963c23 100644
--- a/net-misc/nx/nx-3.5.99.25.ebuild
+++ b/net-misc/nx/nx-3.5.99.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="elibc_glibc"
 
 RDEPEND="dev-libs/libxml2
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index b7391d9c95c6..0c5d3033f7c4 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -4,7 +4,7 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
 DIST openntpd-6.8p1.tar.gz 443997 BLAKE2B 5b86c79ff2f822aba652da92325ad18803233c8b1548203c82603b99d2c41dce012dfb2be67828cc892559f323b764cc1711202fd85bc1d5d755b5e677406b98 SHA512 200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f
-EBUILD openntpd-6.2_p3-r1.ebuild 1816 BLAKE2B 3f24f30a87178680dac1680d7627167a4ae751bde60ddb742d6147d77c052554c26cc1f85f02e33e3bbf8bed2679c2ded0c3097348feac9ec4ee0dfe31bc5627 SHA512 15c0c8bca7a3c10d3328a899385e5b6cfa1d2356b192a07d0c4128ce64373accffcb5e4840a4b90cc2a7f798b3640628638c5bd083435c0fb7d84bddfca17be4
 EBUILD openntpd-6.2_p3-r2.ebuild 1876 BLAKE2B 19b8f6bfaed7a095ff3401fc487877ca0badaa069b37482805e8b50053b701fa1c747894d9fb4c0b6984241f430e6aca442cbf77a2f91ca8b1ff5b7be66ec36b SHA512 8aa659e9a7ebfbd917a7facf394afb552a4eef2c7ab1f248109cfad92d4931a91bc7c38b440721751c013ea5e391b5400464d519cdd16e57eff8bb65b87eafe7
+EBUILD openntpd-6.8_p1-r1.ebuild 1721 BLAKE2B 169c523fc994065c5cb1612e6f76419ce9640cb1c835794a52dcbc8d1c5869b39948791125e86bb9fd92a3c8cb3496ab94c02ec8c3a8e1eadb84259f21c7b947 SHA512 8148f7327a91e7649e798fe7185cfb3690c4e1b64406723654b20b1962e8fba76e12a6b79f41b0680719cf0a7eb4cc6487f8dc98089406bf4b5b4bb4c9b4f8b9
 EBUILD openntpd-6.8_p1.ebuild 1749 BLAKE2B eabbbaa5d63fd9cd7f54da01bc71dea295172b57830d7a367eca13d10a22ad547ffe35e0517959a3ea866483cdf35fda8a1267b84dbb4648677d5e002784300d SHA512 d4405468d57a9f255ae3428bf292ad5689dba8621bd96cb2e8ab2824a7c736cc59cd1759173aa6dd5afe7a0a775d84932472a9ec0cde8b9262cd4d29ad622b67
-MISC metadata.xml 753 BLAKE2B 7881f37b5fe2009a86939eee0c579be8db7ec7ad63a565318dff4a382ce09ebf47575de20112cae24d16e74b992fe7c70cf129c06ab69af514d0b3aa42b0c2da SHA512 34a656cccd278363c5e08c65d90dd4f36e41414e48fcf924ab41bdee826da358e48b70190a882e21b5eabba8c3ff733f75a384c69013d450fb3d9c0517883b72
+MISC metadata.xml 828 BLAKE2B 252026b498239d4105cf5a36f898f7587f046d6f533089d7b52116af656c85d340802f8d6e3b95ccb5263f7795e84248e1fbf2f644213c0fb54b7fdab33df79a SHA512 83fe295d82756146bc8b705e02564553079e0292601b2ef38ba46f05a2388bc77d13a0576de6b30937814a708570247c657f4605767fe93a7ca6c49e0c96cabe
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index f5534c78e2f8..20734983a2d0 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/metadata.xml
@@ -16,6 +16,7 @@
 		local clock.
 	</longdescription>
 	<use>
+		<flag name="constraints">Enable HTTPS TLS time constraint support</flag>
 		<flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
index abfd5096bbdb..630ab20c6928 100644
--- a/net-misc/openntpd/openntpd-6.2_p3-r1.ebuild
+++ b/net-misc/openntpd/openntpd-6.8_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,12 +13,15 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="libressl selinux"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="constraints libressl selinux"
 
 DEPEND="
 	!net-misc/ntp[-openntpd]
-	libressl? ( dev-libs/libressl:0= )"
+	constraints? (
+		libressl? ( dev-libs/libressl:= )
+		!libressl? ( dev-libs/libretls:= )
+	)"
 
 RDEPEND="
 	${DEPEND}
@@ -40,18 +43,16 @@ src_prepare() {
 	sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die
 
 	# fix default config to use gentoo pool
-	sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die
+	sed -i 's:^server:#server:g' ntpd.conf || die
 	printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die
 
-	# disable constraint config if libressl not enabled
-	use libressl || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
+	use constraints || sed -ie 's/^constraints/#constraints/g' ntpd.conf || die
 }
 
 src_configure() {
 	econf \
 		--with-privsep-user=openntpd \
-		--with-privsep-path=/var/lib/openntpd/chroot \
-		$(use_enable libressl https-constraint)
+		$(use_enable constraints https-constraint)
 }
 
 src_install() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2ff7c02a3ce8..25d91ebb59ff 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -52,8 +52,8 @@ DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e
 DIST openssh-8_3_P1-hpn-AES-CTR-14.22.diff 29963 BLAKE2B 19b82f4ff820f52dafaa5b3f09f8a0a67f318771c1c7276b9d37e4a6412052c9c53347f880f2d78981af3830432704b9ad74b375241965326530ae23ec8d74a2 SHA512 49f2778831dc768850870a1755da9cdd7d3bc83fa87069070f5a1d357ce9bdadeb2506c8ff3c6b055708da12a70e9ede7ed0e8a29fcab441abb55c9d483663be
 DIST openssh-8_3_P1-hpn-DynWinNoneSwitch-14.22.diff 42783 BLAKE2B 10940c35ae6bdc33e58bc9abd9cd7a551d4ca76a175400acb872906805bd04d384f57e81049b183d7d892ce1b5f7a138e197366369fe12e5c9dc1349850b0582 SHA512 c09162b96e0ffadc59c6076507bc843e6f8f2fb372140b84181f5fb2894225b1e05a831d85ba689c35c322b5a99302b9db77c324f978f1a46a16b185b3cb28dd
 DIST openssh-8_3_P1-hpn-PeakTput-14.22.diff 2012 BLAKE2B 701f46da022e7ecf35b57f41bf5682a37be453c175928d3ff3df09292275e6021f6108a20c02eec9d636e85ee5a8e05b7233ada180edf1209a3dc4b139d58858 SHA512 026f65c62e4c05b69661094d41bf338df608e2a9b23ef95588062e3bd68729733dae32adab783609a6eca810ccdcbddee25e7649a534c9a283a03282f73438bb
-EBUILD openssh-8.1_p1-r4.ebuild 16460 BLAKE2B a0575d1bd8076aed6b0be21055cda9b9434ed9bd4ddd586e0ab5384dd4255daf5ed2641cb40f81306f3a4a4f3b9ab67c89eb4d0f1a6529e8b447508477daac87 SHA512 190c0a420385fc036e7be1ef54efa866ddef853cd25086b3a6f2e4b601264629bd201b392778038616fcf50dead25ab345a23a4e8777a446a1e4a81aa62510e5
-EBUILD openssh-8.2_p1-r7.ebuild 16886 BLAKE2B a0b36716ed05403c9003b33bfe0a044520d716560730da57f770526bf29d052b7416e5d8ce6d94500621e181d94905f4546ee196eb71c00cd94a6ec2c0f07a3f SHA512 cc5c7aa41805fc8b36e585d65b72d88fafed13f5082de70cad45e1b6418ad869fdcdaa439b3fca9a9b47c29797b16ecfda83e12971ee5dc0a6acb912da355e5e
-EBUILD openssh-8.3_p1-r5.ebuild 17617 BLAKE2B 76705061818c48e4967de3e13263fbc939f4987b739e30d9402177e07d3802ae816bb75cb84f06b68afffbd1904e6f6ced8d7d6204d52ea4917d5824edb4ff6d SHA512 cef0a06c98841193ed1c54c9c4e78da1c7e14ae0af2da72e08b4fa6c3ad7b1e68fcb05eac719be059870e7fa7fa0a58f07cda4f5a25b63475e20eb02a2d5ab4e
-EBUILD openssh-8.4_p1-r2.ebuild 17692 BLAKE2B de5d3bafe44fb47523dbc5b6c7afc54f165d6952844b9981c60a992862c19e11dca5d92a6f5cc4278627351065a37ff8c6b8911ab2e9c40b945faefa56a1783b SHA512 c9342418829172cbdbad1f5cb5f26b71e6184cb78f3ba843e226051ca9c9a514c0ef1075daa8356a3ac63149be2d27e0210ccf27f1c4cdaac890a6516640850c
+EBUILD openssh-8.1_p1-r4.ebuild 16449 BLAKE2B 405605bea6246ce0003dc1bba0077bea05d26e55f13ceda2dbe48d3f4a5cbd00a18e4ec85d2d4495200f31a93b9cb24705f85a01693ef7da9a9451f456b66492 SHA512 066909ba9b01e333a3e20ae965b7282179069f26971cca25c4b48bf03348c2c4589e431ceefa3a59b4658b91d7cb75652b32271ca8285d51542adc288253be96
+EBUILD openssh-8.2_p1-r7.ebuild 16875 BLAKE2B 7b5e94f6432b9471ff3bd79f0a0db35fd7f2c752a0921171b736229bffc31bed854d4bfcab75141670a95c310b943c302590f4ea7721f9aa7212033979fc1274 SHA512 7920af478491afadc9d3550c44e6bfc797767b9c0a775ec3ef5e4d116f5d80712261dee5f11ef179bff4ed8c7ce1a66cf6e21cc33f42c0dd41c917c8b7c48402
+EBUILD openssh-8.3_p1-r5.ebuild 17606 BLAKE2B c10216a426742ca807f6ca7be4adc8462c1c66571f80091eba53ed218de4c182e4e1a44df2afa2c6cbd0a4a250001c6890f5fe8b5855f85ae08901f5aff4bc9e SHA512 cb5a66c09184a57936e652e82f9eb3ae169d50d9213d173b30836013039b538e1c3af2a0c452676d8c15c064e054c8940e8e3d5da4123ce8f56fdf3a837e521a
+EBUILD openssh-8.4_p1-r2.ebuild 17681 BLAKE2B f66807ffa57f2f420a8e360f2eefaa4c4fdbf62c4ee4dbd147152693022e357c5c033b8dee21b9bf96bda087a1b4cfc40b025cccb5f59a2a8220d34ec89fe5b6 SHA512 175df97fde0e4c7d7902679a3fbc4c577bb081b38b9ae6b483d40252030f6d60293b18d7602dcce178a3a6638772761af5c659fa6dfb82c901d3b633d4fbec5d
 MISC metadata.xml 2101 BLAKE2B fabe0e83b78f80666415646d7b85b296c8026f5e7465705555d03237a289208238e182919e75bec29d1113a5b7483a66b53a421e8881533af5d25c79521d9a08 SHA512 b9eb68f11fa10e763f529da88e252a94ccd89b41e857f39bf7c887ddc38c1bfd4aa9e9383a69c506080531f396ad5fdd9e1f811529a04864447a7b3e833c0e9f
diff --git a/net-misc/openssh/openssh-8.1_p1-r4.ebuild b/net-misc/openssh/openssh-8.1_p1-r4.ebuild
index 6b4bedd6a87f..8ca157b9c135 100644
--- a/net-misc/openssh/openssh-8.1_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/openssh/openssh-8.2_p1-r7.ebuild b/net-misc/openssh/openssh-8.2_p1-r7.ebuild
index 2ee020b79867..b40fb15e5003 100644
--- a/net-misc/openssh/openssh-8.2_p1-r7.ebuild
+++ b/net-misc/openssh/openssh-8.2_p1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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"
 
diff --git a/net-misc/openssh/openssh-8.3_p1-r5.ebuild b/net-misc/openssh/openssh-8.3_p1-r5.ebuild
index 25c6597c739f..20705683e44f 100644
--- a/net-misc/openssh/openssh-8.3_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-8.3_p1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 +scp sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/openssh/openssh-8.4_p1-r2.ebuild b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
index 01b1aed7926e..6f909a78c109 100644
--- a/net-misc/openssh/openssh-8.4_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 +scp sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 50401ef4f8f9..9094708c9243 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,4 +1,6 @@
 AUX owncloud-client-2.6.3.14058-qt515.patch 470 BLAKE2B 70a1edb2a2ddd277ac9faf759715a5f7c956e4557d96ad30be8f02beb598ec8f87d6b42f8f5c90f4dbc60d86c022af0a63ed7d3fca44b7cef90955423b42e7ec SHA512 78eb25459347a56dd2bc8e4f7a359402cbd0359c9b5137f39939b0dd396f276d6c13663f3ac380055a0137558f5899527b23391242c1a89dadc6f92fd2f5b7f8
+DIST ownCloud-2.7.4.2934.tar.xz 14151708 BLAKE2B ad6f3d827a2fdcead6fdc2514696e8fbdb75b2d365c9a09602b95b24c669695e3693167f5da305e27e6fb2266f106b50c578def1d1518730926a10f640defbd9 SHA512 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6
 DIST owncloudclient-2.6.3.14058.tar.xz 21246672 BLAKE2B 15b75c2162d22c22827a057242d783e739837f618c2f65be3edce6b2678aaa13505fd14c4e4088374c240537a999d9aff7758ccb93993e0cbdebb886f735311c SHA512 e2159dc5668f263449e7a9a20ef10c6bb140ea5bd1128a6d3438abce03bc4913bb4eecbacc5160c8018398b6fa75ccfb2a9ab9ad637965e41caebc83994b80b3
 EBUILD owncloud-client-2.6.3.14058.ebuild 1872 BLAKE2B 554174a400aaeb6437ae60011b1ed0cb52a1a8c82bfd0d5dc2b797147d38e029e89d993b68514e3fe3d77cba535bb92625f67729be04a950f5ed9a5d5822a1d1 SHA512 975b7ccf846042d4b32f67760cc409b43ca86d053adbac42d780373374c3eaa4488c3adb1ccd86741dc7fcb0794e2332214c0abbecddf0f142850a1dcdc3fd05
+EBUILD owncloud-client-2.7.4.2934.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
 MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.0.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild
index a3dd780f6e5f..4afe35f947d5 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.0.3.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.7.4.2934.ebuild
@@ -1,31 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake xdg
 
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+MY_PN="ownCloud"
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc dolphin libressl nautilus test"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin gnome-keyring nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
 	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	sys-fs/inotify-tools
@@ -33,20 +30,18 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	!libressl? ( >=dev-libs/openssl-1.1.0:0= )
-	libressl? ( >=dev-libs/libressl-3.1:0= )
 	nautilus? ( dev-python/nautilus-python )"
 
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
 	doc? (
 		dev-python/sphinx
 		dev-tex/latexmk
 		dev-texlive/texlive-latexextra
 		virtual/latex-base
 	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
 	test? (
 		dev-util/cmocka
 		dev-qt/qttest:5
@@ -54,7 +49,7 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!test? ( test )"
 
-S=${WORKDIR}/desktop-${PV/_/-}
+S=${WORKDIR}/${MY_PN}-${PV}
 
 src_prepare() {
 	# Keep tests in ${T}
@@ -73,18 +68,17 @@ src_configure() {
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=yes
-		-DUNIT_TESTING=$(usex test)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
 }
 
 pkg_postinst() {
-	xdg_pkg_postinst
 	if ! use doc ; then
 		elog "Documentation and man pages not installed"
 		elog "Enable doc USE-flag to generate them"
 	fi
+	xdg_pkg_postinst
 }
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index babc6f4b386e..2a0deb206a3c 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -772,8 +772,7 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.zip 561290 BLAKE2B 2bdf9fb92ee838f5a9112bc5e3ace3e1cdc7a4dd5b3940c94b36abdbd6def28f9629a49e9ec901a32b76c944cc82af19f0f99f281b15ce666ebf153d062bc052 SHA512 9d01facc2b973a45604ac010f0bf0ec6aa3121966eaea6d7e1ac15869a8f5892077c3bbf0cbc21517890e24379848b8def33bf7dee7b1152ce232dd996ad017f
-DIST rclone-1.52.2.tar.gz 19515310 BLAKE2B 50ba7085d8994f7faf9e723d5a14ef5db0ce1dfdf9ab11394c26e9c8bb20dd62f0a20cd7925f3fc5b870a4eadb7ea7323dea1d0793a51b7c58b10e37676e3581 SHA512 f49f0dcf8bfa105b01b35921daa655a6c1161f6505e2299f027a4059d196adcc673038b1718320e6f0b8bb053fad8d2de7714f66fa245dd90ea0a791e848a418
-DIST rclone-1.53.0.tar.gz 14698622 BLAKE2B cd7fe439f8d657f49feaeb7552fd2efda375a5bb2666d610a678ace6e5a0ecca1d27c8c325ebd935e4fdd7500e6f7baec0e1c70cff0ace411644376c77874e1c SHA512 8313f56d8e597aa08dd322356c21eb1716bf8d969e2e0e8c6054881db1a703c6c4e6c619b4f7f3a5ca12266c003412130868e271ee6eff952a25e4e4ac40ee59
+DIST rclone-1.53.3.tar.gz 14714224 BLAKE2B 0669bd046484867febe6ae201153540c40ce213d5a25eab84e84c97e577012a19423c89a1bc88ac0450ab58279fdd41e746fba266c96618bd0c19983cba3a205 SHA512 17d0ccf1165bc9d36e2aae5729dded2ccc6ecddd8a9902f1ca6b2bb26628afa99f58da5521ec5a1ebb27e8ea04cb736f88279603eeaeb0740cfe633cbe9de083
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
@@ -783,7 +782,6 @@ DIST storj.io%2Fdrpc%2F@v%2Fv0.0.14.mod 181 BLAKE2B 745dfaea0c55cb72e86eaec930d2
 DIST storj.io%2Fdrpc%2F@v%2Fv0.0.14.zip 174752 BLAKE2B c2c40b8a46f7dc5e485a149cf261c08f14ae5d8ec8dfd1c732b29a1960488f53c17189d339ceff176b32058c19fdd2ab0ba6c97199855be9f8fd314b65908300 SHA512 f10a3cf08b4a758cb745cd559e7997f1954148bd4b583c7a5df69efaada6222a4dfdccf5fec129f8c032c84be57efe8418d57403f6649a2ac92a337dcb0fa749
 DIST storj.io%2Fuplink%2F@v%2Fv1.2.0.mod 416 BLAKE2B f7461a1c108d9cacdd6e3131d82490fed0f3e35b6eaa2bd24e199bff10ab3c28540d6c841f091259bb5f4827480b207a697ad42f1721967344b3bd4b022ab045 SHA512 a14dd3bb957b80081434441941a69fe45b062ee0305f5c4f7a32996a05e7a2379501bbfcb8f631a065aa2dbd805c3ec74cf202adfa537e290255e6d3cdf2af64
 DIST storj.io%2Fuplink%2F@v%2Fv1.2.0.zip 100495 BLAKE2B 61fb78c4292fdc02ecc7cb63b6773fff52680dbaf5f86f63dbe21a902c56125cb6fa422f804ba4ffe60b4971fcd3cd0fec7aa64e7e2c1b47440168ab5e4a9e27 SHA512 3a803d8704d6d52018a1110896543a5a1efdaa1b26ee550ae41c8a578b145838b047d23ac5abbf12c6661460ed0973174a52a4192be921551c08ffaf161d3c4f
-EBUILD rclone-1.52.2.ebuild 790 BLAKE2B 8b4dc670c3865d8923c4c03110aa3919d0ce31273bca340d924b3bec89c8e4119fbbc71aaf003d38e34b2ca3cd49f81198d620aba9ccea3f67ebedde436f93ca SHA512 d43a3d54becbdf47c6bee4a70b272bbd7245e266f727880efff1e641a7e0c71085976e7e73fd865e7e758d303d7e3cd20deef759c4a99e661ba2d27d827fce59
-EBUILD rclone-1.53.0.ebuild 43484 BLAKE2B 1e9456708ccaf5b2e510a3d56cd5dd565c089fafb343a739e379572197c5a1460693e2dd6d9b2b0bf1d2f4405f01a922fdd069bff9b39561b73f4536b801eee8 SHA512 f7109a557e3a0ce2073f578f12414795c4d4002965b8d7e9fa6bd401d3afcf796837dd77f27b42bc9801d24fa3252836368be814fc23ec6b1222e17d4eaf5cf5
+EBUILD rclone-1.53.3.ebuild 43482 BLAKE2B 12c4a443fcc7dcf11efe23572f59a65f66731382e99442681ca413007b116c0a566558692ed9fe12143a982bb12693478ab6991b25c79b38fdae4e740eaf9acb SHA512 bb5850a4cf44f0661db46c0a3e4a1ed8bc1358fe832e2fd068036a0f61f8eff1cf9c5bd64406057b7e43c3fd2f1f47b542af039f3de4702acfe7f2c22c349a7b
 EBUILD rclone-9999.ebuild 43484 BLAKE2B 1e9456708ccaf5b2e510a3d56cd5dd565c089fafb343a739e379572197c5a1460693e2dd6d9b2b0bf1d2f4405f01a922fdd069bff9b39561b73f4536b801eee8 SHA512 f7109a557e3a0ce2073f578f12414795c4d4002965b8d7e9fa6bd401d3afcf796837dd77f27b42bc9801d24fa3252836368be814fc23ec6b1222e17d4eaf5cf5
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.52.2.ebuild b/net-misc/rclone/rclone-1.52.2.ebuild
deleted file mode 100644
index 9617d4c91b19..000000000000
--- a/net-misc/rclone/rclone-1.52.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	SRC_URI="https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A program to sync files to and from various cloud storage providers"
-HOMEPAGE="https://rclone.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-src_compile() {
-		go build -mod=vendor . || die "compile failed"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc 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.53.0.ebuild b/net-misc/rclone/rclone-1.53.3.ebuild
index 1066e69c03e7..454851f221e2 100644
--- a/net-misc/rclone/rclone-1.53.0.ebuild
+++ b/net-misc/rclone/rclone-1.53.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -796,7 +796,7 @@ EGO_SUM=(
 	)
 go-module_set_globals
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	SRC_URI="https://github.com/rclone/rclone/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		${EGO_SUM_SRC_URI}"
 fi
diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest
new file mode 100644
index 000000000000..86ea980bc7e6
--- /dev/null
+++ b/net-misc/realtek-r8152/Manifest
@@ -0,0 +1,3 @@
+DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd
+EBUILD realtek-r8152-2.14.0.ebuild 1587 BLAKE2B bcdbc62c548edce699f45a8a90a1613e4a3ded928e4acff581290012c20698d2e640942fe9a2bbf89b416d5f766617beabcc6b593061927f1420a262afb7f197 SHA512 3a2000c4906da96ceaa2bd00ba0de6e48fbea5f0983b66a79c67d470cf0e18464fe9df8b6d5ec189c06df5a66904365f8ed74aa6089bfff30b176e11f8ab753b
+MISC metadata.xml 252 BLAKE2B a7c6d432616d7b90dd77f1595a17154db8559729a787d0b94cbf6c44b3fc08005bd9ad6cd1eecc5fb8bf9f25789f7eac2efd074e6042125a207567f9af292716 SHA512 67a93db722bbbb0e7ed243cb68e60fbe315114013b2326bdaca5d2dd10ae6629bf207152c1cd95a98f6e638346fde3fdefbd35b3e47005a93eda61fd1aee0cae
diff --git a/net-misc/realtek-r8152/metadata.xml b/net-misc/realtek-r8152/metadata.xml
new file mode 100644
index 000000000000..6c5d3e79d48d
--- /dev/null
+++ b/net-misc/realtek-r8152/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
new file mode 100644
index 000000000000..59f0e80e1b97
--- /dev/null
+++ b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod linux-info udev
+
+SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs."
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="
+	virtual/linux-sources
+	sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="r8152(net/usb)"
+
+pkg_setup() {
+	linux_config_exists
+
+	for module in USB_USBNET USB_NET_CDC_NCM USB_NET_CDCETHER; do
+		linux_chkconfig_module "${module}" || ewarn "CONFIG_${module} needs to be built as module (builtin doesn't work)"
+	done
+
+	linux_chkconfig_present MII || ewarn "CONFIG_MII needs to be built as module or builtin into the kernel"
+
+	linux_chkconfig_present USB_RTL8152 && ewarn "CONFIG_USB_RTL8152 must NOT be enabled in the kernel!"
+
+	linux-mod_pkg_setup
+
+	BUILD_TARGETS="modules"
+	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	udev_newrules 50-usb-realtek-net.rules 50-usb-realtek-net.rules
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+
+	echo
+	elog "If the cdc_ncm was loaded before this r8152 driver, one might get a flood"
+	elog "of 'usbN: network connection: disconnected' in kernel log."
+	elog "In that case one needs to unload r8152, cdc_ether and cdc_ncm modules and"
+	elog "let udev load them in right order or manually load r8152."
+	echo
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 91eb30059011..9c0c555fc6f3 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -5,6 +5,6 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
-EBUILD rsync-3.2.3-r1.ebuild 4138 BLAKE2B d0bcca5037a2fd9d41c52acd969f075fbcd056d6976dfe537abf2ef0105acdae5dde99d840925176a30e7c81405277a9fc61cb8b0479009f1f2c74f26ad2f67e SHA512 1da8989d5189cc0fa353d1cba86b415f80a2beed94b55ae276959efc90d0a322476cf81bb295609eb94fe2a6178817a4fd8866ccaebe00d49866ea3373c046db
-EBUILD rsync-9999.ebuild 4147 BLAKE2B 275f2b5b113d92083ad20853e1f1e3573f97a9231e43847e6d49eff0b15016a14e15f79f8bbb627ef0f0ee47607cf8eabb92dc5436772dd17201e0d89117de10 SHA512 dbf5e6bb7256258cbd19ac6e70ce81d4ff2fa7b226890f50662b5d2bd3c9c445817680bc0d096293bccb3fd1caa38f38ea95deb05423e7912e132a7fd7590d3b
+EBUILD rsync-3.2.3-r1.ebuild 4127 BLAKE2B c8d70118e080dda9746754bb30975a656f0b816ab692d4a29b4a5ebbc8f84a79c494f749c8d793f25054a09bbbb2ca230de9d867ade97363a87ebcc841db4049 SHA512 95a0141fb08c248eaab6a3d1c3196da46e7f5839d5ffb75d63d3d6cac016bab4443603557600600943db25de8e9da13c6df9d0e753be8819420080ea068f92ff
+EBUILD rsync-9999.ebuild 4136 BLAKE2B 0b179106e0a894845f7f6cb486b4743caeded0a2155830e44a84add1a92c2b68f4c9251c3c5b7cca7a3e538fe707e8860500dd0ad31e9f0ab2adde71cc4097dd SHA512 e5267e12cf594181cdf4f30816f1211694452a6fd310f6688d352058593e81bf83c3a717f3079683d6f524f5a11a62039bc6cb11e484e229e73db246037f46bb
 MISC metadata.xml 654 BLAKE2B 28ea5b4e47a5e420ab64c1b688425995d9ab4e556a27b56b27f512a15ec337aa6a1028449ae0a2f9fa313df2b5b5e98b6cf98a38dac82eb83ca3b4871f3b1514 SHA512 3e23d80d1c4fffdc38287e0f1a09f44040a53eb1b395dd8e9b47aa6d467ed4cf4a0b379ce578f1ecf6438a4f322375b633dc47fd2a50e7badd5f94054bfb558d
diff --git a/net-misc/rsync/rsync-3.2.3-r1.ebuild b/net-misc/rsync/rsync-3.2.3-r1.ebuild
index 938852ea7007..ca7bad626efc 100644
--- a/net-misc/rsync/rsync-3.2.3-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
 	S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 92e30c85911e..0eb044cd5827 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
 	S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 265899144911..5b00a04d405b 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -2,10 +2,11 @@ AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9
 AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
 AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24
 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed
-AUX socat-9999-stddef_h.patch 1272 BLAKE2B c6ab67b4aba676387b3d1584b03741ff829d5455991e67a5a0262cb529b965545e2935fa733a7c9a01a8c36cb2378d6d3e443a978a8993cab55bdf06d724d260 SHA512 b951fbc1d8fe26babe69fde1acc779907e00866c1a6bba85e37a4e173948ad2ade9aa7835a0e9ea1ec8902d0b181ebb11ace57ff0f8ab570301d8d35849e939d
 DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
+DIST socat-1.7.4.0.tar.bz2 509023 BLAKE2B 97ad5f5a52375aea4d2afbb4ac6143a86bfa057aed602d552b015f6c9fc6a3a0cc65b1717573b3c60bed482da908197366bd1d282ee1db6fd86a229484d2bb9f SHA512 c4d166c2259271a70f81d6c4972549549c3fc60a9e47cc03eff1dd4d71c298ac39c177ae3c053dc0c97c2770fe8d157fd0bc6f2c14aef91625f868894d5d7c61
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.3.4.ebuild 1470 BLAKE2B 66a9831f221508582151c54a94706c9022d7c5366b9da8aadac55d0aef83bdd4d166f48ebbcd00684f65c9ba7b5e1ecdba5afbc5524cd9394b8228f7e22d7689 SHA512 260a5b73bf09eec8ee427dd32e9326e5dd54000ea9fb5446d78b456f1ba3a0de5a0f0a1d416b580fe116a255f60e06139dc84bdf3e3de47dc0822ccf314138ed
-EBUILD socat-2.0.0_beta9.ebuild 1554 BLAKE2B 4fd6cd332d44b5a0499e246a04bd99081bad7242c4f4fc1ac12596a475545cf4b7e26d3cb51f4871c11ffa791b7b2c29a17005434b8370fc391877365a73351a SHA512 537fd04485508f2363f97715d03604dc2a3e5caf6907a17ae478eb3c0053d0edf6dc1a9798746c4557085aee7a8413961817b1205c577c0fe433740c06783c18
-EBUILD socat-9999.ebuild 1395 BLAKE2B 0884f6b4f865dc2ff255e5a48a45c0de198b3b926db598d18472758767c6a7e10978a59a88b7ec543bd1f5b8b4a18aa67b42bf59cbd3ecaf2696e83932940b53 SHA512 8836b32f18f8680bf27c26c10ac996d14befcea2f1f2ba6aab2f5e433e757ec51e81a0bebfced410c7e07f3cbd9704af7f349441530e223d132ccb5c78a3cc20
+EBUILD socat-1.7.3.4.ebuild 1586 BLAKE2B 7dfdd2075cee949d3252488fb60a5d3370bf540463857521a06b5e3fc32ae75195a4383e8dc18673322ef3db9ab2f25209ac638e67e7ad65bc113a3d4285b50b SHA512 716db6a19271e18a9f08386ef2906f55d7c483186e3622fca19075b2fbcbb57c3f22fc7adf62398528b576afff040aa6bef3dbf6d6ccd9f0fc919dc1f9faaa07
+EBUILD socat-1.7.4.0.ebuild 1534 BLAKE2B 1ab55137a27da5a25d6cb8d3ebf72f7b52aa0161a8ade16892fd68d0c6e40922996228050d51d72ce8e13f712574aa85249a550e9e6b3b65eb7e606e6d12a970 SHA512 3e3a47d3e41a8dfa9dda7c625d33d04f34c1a22695ff866db5dcf2234d9e8725a4ce80d241032a991df65d2086a204a660c8695ec1130f3cf245a32a58720fe8
+EBUILD socat-2.0.0_beta9.ebuild 1684 BLAKE2B 8b12d6c8f85d1f3d161238100f994c1f85862b1abc0d5759eca22d5e743821d1cccd2e1f505b19faf8ad4d65803fe26fd1a388b8a21802f000ec94d9f145a360 SHA512 5c3c58e869b297dfffded35ff69b6f34574901472196863bd8f29d52e4957129923c2f0738dc0a0b64c6cebbcb421be20ff008561ab53bfc91f543a0f96726d1
+EBUILD socat-9999.ebuild 1406 BLAKE2B c68fd7bf03d58f1bd16266304afab4cc73e2e129be5facb7416ed0a765fd198b02a76e5459b4dda831e2c4765c6cd9d4e0669dd024795161f38909c62d882116 SHA512 6ab7b9aa353e917b8aa46f2179bbcff95fa03e1e59ff4a8f68c512cbc8a582d5e288bd79a2a251c47837b60318640a1005392e0ebc72844a08327e41effdcc18
 MISC metadata.xml 467 BLAKE2B c95bf4d69aaf5077911ffc97657ec511286dd4f524fa4b9a1d537cba55d6fbc6ed2bdebf5379daa7c340a2f56538a2546971b39e7915baed943b177e7813b781 SHA512 2eb27fc5699059cecf00fa097c2e09440d5efd5a3b851631818d965bbda6767bfcc60a663d24569ab8b89a2e60bac9a5aead5fb3ca52d15e1d250140e7b70514
diff --git a/net-misc/socat/files/socat-9999-stddef_h.patch b/net-misc/socat/files/socat-9999-stddef_h.patch
deleted file mode 100644
index 802b578d4a29..000000000000
--- a/net-misc/socat/files/socat-9999-stddef_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-When disabling OpenSSL support, nestlex.c still needs stddef.h which is
-magically included through the OpenSSL headers otherwise.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@
- AC_CHECK_HEADERS(inttypes.h)
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
--AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
-+AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
- AC_CHECK_HEADERS(pty.h)
- AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
- AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
---- a/config.h.in
-+++ b/config.h.in
-@@ -189,6 +189,9 @@
- /* Define if you have the <grp.h> header file.  */
- #undef HAVE_GRP_H
- 
-+/* Define if you have the <stddef.h> header file.  */
-+#undef HAVE_STDDEF_H
-+
- /* Define if you have the <stdint.h> header file.  */
- #undef HAVE_STDINT_H
- 
---- a/sysincludes.h
-+++ b/sysincludes.h
-@@ -51,6 +51,9 @@
- #if HAVE_SYS_TIME_H
- #include <sys/time.h>	/* select(); OpenBSD: struct timespec */
- #endif
-+#if HAVE_STDDEF_H
-+#include <stddef.h>
-+#endif
- #if HAVE_STDINT_H
- #include <stdint.h>	/* uint8_t */
- #endif
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild
index a364c0284ad1..3eba54db2ef8 100644
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ b/net-misc/socat/socat-1.7.3.4.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
 MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist libressl ssl readline ipv6 tcpd"
 
 DEPEND="
@@ -23,16 +24,17 @@ DEPEND="
 	readline? ( sys-libs/readline:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
 RESTRICT="
 	test
 	ssl? ( readline? ( bindist ) )
 "
-DOCS=(
-	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
-)
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
 )
@@ -49,6 +51,7 @@ pkg_setup() {
 src_configure() {
 	filter-flags '-Wno-error*' #293324
 	tc-export AR
+
 	econf \
 		$(use_enable ssl openssl) \
 		$(use_enable readline) \
diff --git a/net-misc/socat/socat-1.7.4.0.ebuild b/net-misc/socat/socat-1.7.4.0.ebuild
new file mode 100644
index 000000000000..1db0f86eaaf5
--- /dev/null
+++ b/net-misc/socat/socat-1.7.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild
index d5d7fe265575..0f00e1445827 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
 MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
 SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,12 +26,14 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test
-	ssl? ( readline? ( bindist ) )"
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
 
-DOCS=(
-	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
-)
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
@@ -59,6 +62,7 @@ src_prepare() {
 src_configure() {
 	filter-flags -Wall '-Wno-error*' #293324
 	tc-export AR
+
 	econf \
 		$(use_enable ssl openssl) \
 		$(use_enable readline) \
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index 7d28699e42fd..dada7a8478e0 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3 toolchain-funcs
+
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
 EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="libressl ssl readline ipv6 tcpd"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
 
+BDEPEND="app-text/yodl"
 DEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
@@ -21,24 +22,16 @@ DEPEND="
 	readline? ( sys-libs/readline:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-BDEPEND="
-	app-text/yodl
-"
-DEPEND="
-	${RDEPEND}
-"
+RDEPEND="${DEPEND}"
+
+# Tests are a large bash script
+# Hard to disable individual tests needing network or privileges
 RESTRICT="
 	test
 	ssl? ( readline? ( bindist ) )
 "
-DOCS=(
-	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
-)
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
-	"${FILESDIR}"/${PN}-9999-stddef_h.patch
-)
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
 
 pkg_setup() {
 	# bug #587740
@@ -51,13 +44,13 @@ pkg_setup() {
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
 src_configure() {
 	filter-flags '-Wno-error*' #293324
 	tc-export AR
+
 	econf \
 		$(use_enable ssl openssl) \
 		$(use_enable readline) \
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 11cbae2db7e5..93cfe04b8a07 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -4,9 +4,9 @@ DIST sslh-1.21.tar.gz 111298 BLAKE2B 46003021292436023c7f2e0d9cbfb283f4ca7497f5d
 DIST sslh-1.21b.tar.gz 111740 BLAKE2B 5d42eab551e05ac1367da9ae85eac945657e086672712c148ee07c78af5c2a546e696d77081c7282e77c8bef535c186f89d541489f07153bd7ca2d338b341a48 SHA512 59bd33b47b70f82ae1ba3d6ffac3d54897dc6b7343d0d9e3bb8384adc30ac8a44a64e71590a7eecc5a83c2f70712bd79c0eb4ea8eef15ae770633dead9888c5f
 DIST sslh-1.21c.tar.gz 111895 BLAKE2B 3ec7a4a4f8eb7ec3d22e9630070037ebef7df2cbe3657a38234573ecf4eb9f331914858f703690b094ddc1977cd80b3a5760b94004f35a2ec2c59761f6cd142e SHA512 9446c6afe965684c5d6406ac8917338f57d95f8fbfacd7a51193dd5dbac77e1ed5e39eb8e2575e7025a8612b25e9fba7e64832a48c999f366875217b9328da22
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
-EBUILD sslh-1.20.ebuild 1927 BLAKE2B 826342d1c48ce7137d43f17954fb4bbe116137d57f6f10ebab8dc94721121d16caaa228a86be56d6b3ef1a2ea09437a8efb3eee20c3445684b38814157022319 SHA512 42d8c60970a21165bda0bd8a782d1858a71017716b01d31607435cf9219854c6f388fa8f7a74c9fe6755f197a403dda17d094dab910cf0b7b2ae4f2e3cfc7d0b
-EBUILD sslh-1.21.ebuild 1925 BLAKE2B 79690ddd6a4e9ce7ddb451f6e7696b1355df9f8c014dd67a6b477ce6ca63911ebf6d2a334b40d5e1ec849dcc857ff65c3a646f8b7a4d1ab54cb588f959f994bd SHA512 5b02e1f81a0f1f7b6845d38de0107bab70d7b19e49f494b3bbb0939a557b52d1a337fa5646cac66cd3eab801bbfafaeddd0986857b3e519cae91f88667c25ce5
-EBUILD sslh-1.21b.ebuild 1925 BLAKE2B 79690ddd6a4e9ce7ddb451f6e7696b1355df9f8c014dd67a6b477ce6ca63911ebf6d2a334b40d5e1ec849dcc857ff65c3a646f8b7a4d1ab54cb588f959f994bd SHA512 5b02e1f81a0f1f7b6845d38de0107bab70d7b19e49f494b3bbb0939a557b52d1a337fa5646cac66cd3eab801bbfafaeddd0986857b3e519cae91f88667c25ce5
-EBUILD sslh-1.21c.ebuild 1925 BLAKE2B 79690ddd6a4e9ce7ddb451f6e7696b1355df9f8c014dd67a6b477ce6ca63911ebf6d2a334b40d5e1ec849dcc857ff65c3a646f8b7a4d1ab54cb588f959f994bd SHA512 5b02e1f81a0f1f7b6845d38de0107bab70d7b19e49f494b3bbb0939a557b52d1a337fa5646cac66cd3eab801bbfafaeddd0986857b3e519cae91f88667c25ce5
-EBUILD sslh-9999.ebuild 1947 BLAKE2B dd2d92d360b3b078d5dc20c4e4b1ca4c2a4dad1ebf8d40bf788784221334eb64929cf33c22e598e4f8d7a0e391ddac5cc5d05704bc00e65f8580fb17403d8786 SHA512 872e36bea8a682048e23dc8c5a3b0f1de89151e4138b4af98e192d0903fb55b8342dbb285a3b71f9087b263b46e93d741c8b56d8cfde0583c049d414b784c88f
+EBUILD sslh-1.20-r1.ebuild 1929 BLAKE2B eba93f9518e5dff10b6cf1e41922457f3527a8c2c8b00170125166fdfae56839a0a24c93c83c2e1a0a8b23f294c312d493a1bd821362a8f5ad535e277057c50c SHA512 1d1734e8b1dce6c26c619402a7194e3386130c48f5392b785f0eef43b80f24f344acb2eaab43fb4b495980e94383c1ced53f4d88027f09c6c3d35d32b95fb1f1
+EBUILD sslh-1.21-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
+EBUILD sslh-1.21b-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
+EBUILD sslh-1.21c-r1.ebuild 1927 BLAKE2B 3a0a8bb7733eaf9b89f2ca0d26ac61c9e729f30924ca8544aaac1dbb95f2e29eb6978c06b72a7e125366cc5175d036f30eed9b296a16eb83200405668a1e77da SHA512 a458923fc4a157ee506ef578d9155b46b709b47ac6c79b2a08c85c374826968b38bb746784b563535f1222f397eddcdf72bca4e832d5333cd0a1b227be389829
+EBUILD sslh-9999.ebuild 1949 BLAKE2B 79a3ece7a5661b89708ac99bca1ad206bd5ca7e997551fd1393f4c75510fe7ce73e2196093fa25dfad3a324285925a2b32a26f34fc35cdad02789a5a92b823fa SHA512 55998165014dc2ce31124206fc9248bfbfdb1bc5ed0f4c66d78bad67fa51591780ac6c2face08bc0f3ef31bb628f945b69e714abee27ce9aed9ffee1f47a3834
 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da
diff --git a/net-misc/sslh/sslh-1.20.ebuild b/net-misc/sslh/sslh-1.20-r1.ebuild
index 58cd75f35f97..55f5f8809262 100644
--- a/net-misc/sslh/sslh-1.20.ebuild
+++ b/net-misc/sslh/sslh-1.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,7 +24,7 @@ IUSE="caps pcre systemd tcpd"
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
+	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	pcre? ( dev-libs/libpcre:= )"
diff --git a/net-misc/sslh/sslh-1.21.ebuild b/net-misc/sslh/sslh-1.21-r1.ebuild
index f112f155149a..db0cf15ce9e6 100644
--- a/net-misc/sslh/sslh-1.21.ebuild
+++ b/net-misc/sslh/sslh-1.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ IUSE="caps pcre systemd tcpd"
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
+	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	pcre? ( dev-libs/libpcre:= )"
diff --git a/net-misc/sslh/sslh-1.21c.ebuild b/net-misc/sslh/sslh-1.21b-r1.ebuild
index f112f155149a..db0cf15ce9e6 100644
--- a/net-misc/sslh/sslh-1.21c.ebuild
+++ b/net-misc/sslh/sslh-1.21b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ IUSE="caps pcre systemd tcpd"
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
+	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	pcre? ( dev-libs/libpcre:= )"
diff --git a/net-misc/sslh/sslh-1.21b.ebuild b/net-misc/sslh/sslh-1.21c-r1.ebuild
index f112f155149a..db0cf15ce9e6 100644
--- a/net-misc/sslh/sslh-1.21b.ebuild
+++ b/net-misc/sslh/sslh-1.21c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ IUSE="caps pcre systemd tcpd"
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
+	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	pcre? ( dev-libs/libpcre:= )"
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 77b77de39d48..81bb80b2588f 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ IUSE="caps pcre systemd tcpd"
 RDEPEND="caps? ( sys-libs/libcap )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
-	>=dev-libs/libconfig-1.5"
+	>=dev-libs/libconfig-1.5:="
 DEPEND="${RDEPEND}
 	dev-util/conf2struct
 	dev-lang/perl
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 6ea2621dc349..11760e15eb40 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -7,6 +7,6 @@ DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1
 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 2793 BLAKE2B 171534b2db1295d9a0f23664a43d5f01a45b113397c24c8e3e53484cd1fef30b609f3d696eb76ec57a3b2408c1f52e5755ab7e75b9669b247170dcb3b8790b81 SHA512 27a6c83a40b46a568091bffc0586fabbea86df217bca9f674156e08eeb15ff7443caecc78c678c33e0f10e69bcfaa8b4c36c08a72a147d66068013c3b43dd934
-EBUILD stunnel-5.55.ebuild 2776 BLAKE2B 86509c863ced503d76200396e7d1598291fb1c85fbba5151038c4104424a3973985a0bde6ab408f9d98ff955971da94f5c139b31e8b9a7bfbee11e414d292b9d SHA512 f0407de3288d9f26a36ce71d7cced9513cd9baab378d2ef013e5401549418d99017fae5c2a54fd7cfe38659ae160a481aa038ef22f65a1ee5eb60edf280b8ff5
-EBUILD stunnel-5.56-r1.ebuild 2904 BLAKE2B 89c1e6b0dd5923cae0575c002343abc295b7d2a745df998307f0bf71e12cfcacc951ce452d6809f30086cf52b4954c291ac64efbe48079edd68b5893029cd017 SHA512 235b6410724e2114f571a19b8c9a5b7924de0cb2142681dc4007b5a38e6ea2ed8282b2e7681a3d3514cdee50b7cd6a718116a25640fcd8c56ba3e1452ed23402
+EBUILD stunnel-5.55.ebuild 2765 BLAKE2B fc58336184cded5e804826ef244c7be76b299fe97d27cd8c3bd905734e955e3328c6d04ed017596a111af0e10fa3cb816df2cb9d19e2e730874c5d7049a41e91 SHA512 0a97d7b0d6324a84ab63361f8d2331e8960e657cd9bfccd6275cc110b38b2bf0697f394fc89354a0b48c446815f8cd550e95971881b0862f104c496107946c40
+EBUILD stunnel-5.56-r1.ebuild 2893 BLAKE2B b28033d76fc038da5bbc15bdceab0d34e7e35365ff94a15cb6c9f6227958fbf2047415f4dfcd041b11fc206ee542245188088e75bca20d1fbe3f20b969501b38 SHA512 959cdbaf092c634f9b2626cf6a68433588dd42f6a8c94d717d37cbe80bfc9017c5072d6d6c6fa8a1ba49c289c5b1d0b5624d3e1add28d9d7c498e530857df9fb
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.55.ebuild b/net-misc/stunnel/stunnel-5.55.ebuild
index e60ae52b69ff..2a3a28d96e59 100644
--- a/net-misc/stunnel/stunnel-5.55.ebuild
+++ b/net-misc/stunnel/stunnel-5.55.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=
diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild
index a6540f0fb4ad..32b76bcf26e4 100644
--- a/net-misc/stunnel/stunnel-5.56-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ipv6 selinux stunnel3 tcpd"
 
 DEPEND="dev-libs/openssl:0=
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
index 64a6200c60c2..a0c540fdf46e 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 78d5fdc9641523fdc2f83b787323df011ee09e2e3028a6a0e0c678c93c9f359db83432c472632aa9324c1a981f5bb1f74c4dca843ebbcaf465c445cc69eeec16 SHA512 ab7a2d72971a035f1f97a8178e5f8ad469cf2e452e7234ce81e25cdf715f92c70ced27a741cf380d416ebbd3c55297b901a4e95fbe9e0ac6abaa1c260ed25efc
+EBUILD throttle-1.2-r1.ebuild 485 BLAKE2B 551e81e251cf661d6ac5aedb58ee6d7d94784de8caacd40e3b48e31400ae2f4db55e0005fa9ecedba754de96ee54db5304ff66d91086d7f6cc9e8108f48eb8e0 SHA512 6f6b8ae23331995bede3fdd685f87e4822353ca2e197e3b2da6b41d873048511ff0277d3812f6533639b5faad142693bf311f2ae935b2c66413887081fd67087
 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 b53fd5397ed9..4ca6bcf6e390 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/net-misc/ucarp/Manifest b/net-misc/ucarp/Manifest
index 605c12bca68e..1e00f5f3dfd5 100644
--- a/net-misc/ucarp/Manifest
+++ b/net-misc/ucarp/Manifest
@@ -8,6 +8,5 @@ AUX vip-down-default.sh-r1 118 BLAKE2B b9e814d9247ee11978f2a5cf5c285aa4ab0ec8a1e
 AUX vip-up-default.sh 132 BLAKE2B 01d0976bc4029250a481ad22db0432b62604030ed2d6d3f93e6bf9fceed1d077bee1eb9068d748faaae1bae91d3f7e347d411fa8e7cb4e40da98017980af9701 SHA512 4db8a047c39671578d0fa0e0dfadf3ce6e4f5881a85811c5c8e986f26c97b5de64cc58578cd77ba9ee93e2c6659b178c69575d3006934da56736441c30c703ce
 AUX vip-up-default.sh-r1 131 BLAKE2B b0067bf6a9c442fe536564fc50f589be00caf7dbacfe1bb2370d467a5f5e706a548bfb5db8d2f5d21bf946ab543e0a2f84c74d07d737772c70713c583ec551a1 SHA512 d00a2acaa44567f936e029af96a841bf815b75e18f5d2563800e996acdea68ef3265e7ea7b67e7cba3fe671e7809ec905e9cc39ad5fe2c807170cfa1fa6595ff
 DIST ucarp-1.5.2.tar.gz 429089 BLAKE2B 2e30b5c2f1f4e51662e9dab0e3b32eae636fbaeb533df2c8753dd1df8199101aa75b146bda1035fd77b0d209617eb9eb1d3a8b2fc4bd5089e6c1478c4a821ef8 SHA512 568ff2061e59d314c72a160ccb42eb099bf7cdf04bc30f405b5b62322dff3ceb4fa037c2b430fdb4cee25f0dcacf9309a15bd814b4b70b640840400bda20b253
-EBUILD ucarp-1.5.2-r3.ebuild 1247 BLAKE2B 067f4cab17d51e15ffc2abd8407450ded183e6e6ac7d82af3994b0b1ebea0f0da3e3ef25ed2b954cb07379a2249ee050b62913493821bfd3c97c7785740589d1 SHA512 66ab66b2db551c97bee096a2f1d81767c10e6beb96c2268504db219c2b01b4edae118c82ca04c3fa2d153d486673ab108caba5ff43d5168530f9a5a0eea75bc4
-EBUILD ucarp-1.5.2-r7.ebuild 1450 BLAKE2B 3571bb3a3fa11476607ec3815616669e21559e7293f4e40686a578a8fcbf5e82d5ae7a27667362fbad0f7571995ba19a349f0d9e08c6dc38f0e5caeca2cc3dd5 SHA512 2b581d01af3b1d423837a1f1c9b1432d98a2068d6a5c9a997c47e80c33430fbdc388778fb22f8c5ffe5ac75cca97c4221922584b35aae190fb7ac82b39197ab7
+EBUILD ucarp-1.5.2-r7.ebuild 1449 BLAKE2B 2b683279698197cfecda7f838cbeaa8a8aecd4d62303fe65776e565c3c695f9da451ddb1839142875df91099f195d5d723b968b607eab9363cbdb852f5b965ab SHA512 51221af2c881fe34adf6c1eb1ccbe6f96a128ca83458984c1b62a0aa41003ac05c803d91c99f595defde5f16a34b3a2e5ce0778411224d69be1260f2a1cf4ecb
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/net-misc/ucarp/ucarp-1.5.2-r3.ebuild b/net-misc/ucarp/ucarp-1.5.2-r3.ebuild
deleted file mode 100644
index 7a09ba18faf4..000000000000
--- a/net-misc/ucarp/ucarp-1.5.2-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)"
-HOMEPAGE="http://www.ucarp.org"
-SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	doman "${FILESDIR}"/ucarp.8
-
-	exeinto /usr/libexec/ucarp
-	doexe "${FILESDIR}"/vip-up-default.sh
-	doexe "${FILESDIR}"/vip-down-default.sh
-
-	keepdir /etc/ucarp
-
-	newinitd "${FILESDIR}"/ucarp.initd-r1 ucarp
-	newconfd "${FILESDIR}"/ucarp.confd ucarp
-}
-
-pkg_postinst() {
-	elog "The provided init script needs to be configured first."
-	elog "Edit /etc/conf.d/ucarp to suite your environment."
-	elog "You will also have to set a shared password within /etc/ucarp/ucarp.pass"
-	elog "or whatever file you have set \$UCARP_PASSFILE to."
-
-	elog "If you need more than one instance of ucarp running, simply symlink"
-	elog "the init script and create a copy of the init script configuration"
-	elog "which corresponds to the name of the init script."
-}
diff --git a/net-misc/ucarp/ucarp-1.5.2-r7.ebuild b/net-misc/ucarp/ucarp-1.5.2-r7.ebuild
index a843fc050bfa..71bed0a3f337 100644
--- a/net-misc/ucarp/ucarp-1.5.2-r7.ebuild
+++ b/net-misc/ucarp/ucarp-1.5.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug nls"
 
 RDEPEND="net-libs/libpcap"
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index d290b034ccdb..cf1db9fb2586 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,7 +5,7 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
-EBUILD unison-2.48.15_p4-r2.ebuild 3009 BLAKE2B c6d6f34bb42d24e4045040a02cf4e5f83e4fe803b1d68b539dce3b723d0ee7d45d14543657e9ded729eafda23bb02bfa347645d35384c511aa55ff8c2d1f0f8c SHA512 5debbdb871a92943168ee1d204518f69a0902be6d2f8f918533b492b8b3cd0e84e6409a7e6a7159e8b2843a10e2e1104ad3c38aa099fd7f2fefdcf39856b7307
-EBUILD unison-2.51.3_p20201024.ebuild 2783 BLAKE2B cd624dda358fae814145828dfa9af9dc40a0aad64d41d2bcb36f68af72be046a0efe755c1d7433d9d3ddfdb6dcde05fe8646780c3a1592218c9ca6102b312c13 SHA512 222888178e3c4163ca1c9ae3360caeb382929e53b2c3221a8cebc59fdb862e83838fce24136eeac38a97a3fe11af7c335818e59d004abe4f1518e3f606b4dea0
-EBUILD unison-2.51.3_p20201127.ebuild 2763 BLAKE2B eda83c7269c84e0c4c72ddae78ac0d78cf6c55549e0b5cd83e8e71dfa95022eb579521cd4ce1da4f687ab7e5fa4c766fdd580319ff3bd5a5bdddbcea4ffcc292 SHA512 487451fbd0eed376ab0398cfbe1b4c6196391b45e3e4b7df7137bbf5e260919a4b90940eabf642186fb16a603fc84b105a0c1dd8f1f33785b39b31a79fa62e5b
+EBUILD unison-2.48.15_p4-r2.ebuild 2998 BLAKE2B 3477822b9772652c245d6047e29ecdf70522f7668e9fb2e29e9556afdaf26dd96635983bf182ea5b2b56a0cd56b4bdae06ac0f2be399d1dd616d0e936fd346e5 SHA512 a6d3fb96a29e5156e7519f3f62a07622e1333b530afbfa1fa5cbf11524f5e9e8aa7df63af589d949bb904d8ab1fd6840d970fc27496f72033da2e9291d89c6c7
+EBUILD unison-2.51.3_p20201024.ebuild 2772 BLAKE2B 4e1973839a992c1af50332b8f84c6a7d5d03c1962af8f4a9c183551f1247bc1890d85aa7651d71a12f96134e63e367c00f79bd2917322c8cd278afbc852b4daa SHA512 086fd563d0f74661d710ab07ead1c73ea7702b4fe427336a5da39d8c4d3b4e2fcbf2f25fa7c65e0ddb895b13e0fca3dd381825b2fac41da8e32bf20c01569e2d
+EBUILD unison-2.51.3_p20201127.ebuild 2752 BLAKE2B 232dabfe54805fb5445d4ad87c81c26080a696ee03d8516cfd2340709429dce95d2cfca1359fd96d4c847e3e6ebf14909fc6805d77f55689b3808a25803d9c0f SHA512 f8b47ef5896c0863840356ea0871bde1471bbedf787344502df57026222361837519e2c7279fd9bc0ef5e00fad10523a7f401f1f715ebef72c1b6a468a6654c3
 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502
diff --git a/net-misc/unison/unison-2.48.15_p4-r2.ebuild b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
index 2b4efbfb62ce..1f9bb1d55d0b 100644
--- a/net-misc/unison/unison-2.48.15_p4-r2.ebuild
+++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI+=" doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 
 # Upstream, for this version, has explicitly disabled test with marker
diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild b/net-misc/unison/unison-2.51.3_p20201024.ebuild
index 36616120b23c..7f864d5d40bc 100644
--- a/net-misc/unison/unison-2.51.3_p20201024.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 
diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index f1758eeb5557..a035fe9b7214 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index b0d07f80bc0a..5482cae1e5c9 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -1,5 +1,5 @@
 AUX wakeonlan-0.41-ethers-lookup-r1.patch 2287 BLAKE2B 95bacd277caff21b056f3a8c159808594dce0fc60c735757148a315c87d02d110695b343eaffa28b067668b2f874ad1f88516fe9cee4f98621ecbb15396b1b4f SHA512 52a0b30aa8a2beee0056112b49cfe6ef6021f682f7ba1ba38173d227f5e103f34fdded8c61b7b399cc548ca5e182b47d320af6dffe617673aa873f08c20e1bc4
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
-EBUILD wakeonlan-0.41-r3.ebuild 644 BLAKE2B 85920ed07e23534e6576329b5b36d20e6ea06d5f7fbb7d33690f282c3479df9d68c5af6a2fd1cca6f514bb7b52df16d787eae31c23cf6c6709ed9737f402e63a SHA512 1283e5a841b52e1fa4d8120d315f245608afdae335185de9a5f39602efbf49c35fd118d4d4312ebfe0d6f4dab85ba1c9e44f00118e540f5e8f1aaeca768e148e
+EBUILD wakeonlan-0.41-r4.ebuild 613 BLAKE2B 1df96c919a21024edcd733591e752945dc4ef2fa95e1524fdffa5fba919d88090b29b47ab7c731ec45a39f4c4ce8a158821ee733a2109dc32e35c7ab3ed5c525 SHA512 ef9be9c6d91ea564809ca785a33ad2838ba363f13b12ceb9f660771f0e3bd408fd759d2724aa031fe417a45badbb0478ebf91382b12e240db3f2b0bf9e0993de
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
index 6106c0a10112..34b627cabd74 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r4.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-GENTOO_DEPEND_ON_PERL=noslotop
 inherit perl-module
 
 DESCRIPTION="Client for Wake-On-LAN"
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 081a426a2c71..13d7e90a10e2 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,6 +1,9 @@
 AUX wget-1.20.3-gcc10-fno-common.patch 887 BLAKE2B 34b94aa99b2335ade4f6c3e1fbb5b739143b8a9706d153ba598a1849898151df3482df416075c67efdfbf5adbac4efe3e72d7ff412334dec9647b89cfe1d9a6e SHA512 b7008692ca3a35a49ec206e3314c232b24e26821d280d4346e7a63b8e2d2592614d2b290880379f861bb4f0d97977d0205660d2653b9cce6ac0297c2d224002d
+AUX wget-1.21-avoid_bashisms.patch 870 BLAKE2B 12c695361b55fe9f1cccac1d99294af9685f83a6dc7a05fc0eb90a1fcf9b12677638de9a78db6889a573b365e2688911ba4ddc9b2f9cfb8675b4b1cb594a7d51 SHA512 62c462fca5b4c7600e12c6e0f8895d91ae11f1b14dcdac642e8e248abf83a93bfc045e10245872677d72b5d3720ebaeb62473e6d396e5ced9c77714928d105cf
+AUX wget-1.21-avoid_eautoreconf.patch 214 BLAKE2B f03448fb7d494544d3fe579cc4460ab8d36bb033f0bdcb700fcf851c4e0e2e539bdc5d1bd08dd3fcecf3aa1957ff7ac68a858716fd96a9510f6cbdde64e0b92c SHA512 161f728b002335753ed085052092ae0563ce8120f44ec8bc06a47743ed6528996ec9e00a92de017eb5de863216c1521bd69663f97cc69f64e2579b08b6bb5f27
+AUX wget-1.21-gnulib-utime-errno.patch 753 BLAKE2B 01d236f8252e1ea2764e317f78740fa6479407ec2e25ff92b8be39e5bbadb33b73d263c326f12372a542cb044f52d60cab76caab1f496739c5b4d3a795c3ae1a SHA512 02b48efcad960e7b1b9b623bd8e99a55ce546e149536b9a43a15f494ee256d7c4616a5587734ee3b5c1c90759950cf48ecd54f1918f1a828fabf28e9158347c3
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 DIST wget-1.21.tar.gz 4866788 BLAKE2B e019df0ba0eefb0d6de0e73a73e7dc0ecd46048831ef3b4719ab47ce6895de7da3163902ff19881eb60eb4f67568a7de70092f62a8f8397a5ac9583fb689ad3a SHA512 13313a98f91ef34ad90103f076285549eb4887d77953e9f192d3b0667642b5ceb9e2e30091f766cbf1d6ed423499c497ed85d826f3f3e92f0711aa06d8303c5a
-EBUILD wget-1.20.3-r3.ebuild 3385 BLAKE2B bff59587a30c3e3d13d736cc39eada0196dc1db6dff6a8ed529ed5bf897de75b0ba20b658b33d0774085743283eb28530cc6221471a247eafbb3cab550e6dd24 SHA512 eb573466f0b0b163d95dc6e34bb12d4e9480a5346d4a21610673c962638f2082e8573eb68f0e0de71dbfa6f84a360bafbc01e89edd566e1a1e77560c9d9ed018
-EBUILD wget-1.21.ebuild 3339 BLAKE2B ebc3d8640844be1e9e34db3df309e779d918fc80a4e9d6e1fc0a45bf69146e749d93014d32625ff51d78d1305867bcdd790cda9aa7aa1860fad863aab384b9dc SHA512 6219dc3ae7f4c048ad1488ce918111a278e8b08e622ba35ebbedaf5eccf7271496392ca0a35bd7b4adf360b5e896b6c7b2675b3449d693f15476350e4a0059a9
+EBUILD wget-1.20.3-r3.ebuild 3374 BLAKE2B b18227c786df61dbe839e4beaa0650ca1a04c34641997d8a8b967ff1a4cab06c662e1e702dc47b6fc90e2dde17e6c4d5c230b002e8613c3b2f82739af7fa2d98 SHA512 d62288f05bd78a46a97b018b9bdcbc2905f337b7a2f10809aa8c5cc421b570548ac611c2b1f67b1ced3361789de1c13783647fa3c6cfc7807afce037d7ee95ea
+EBUILD wget-1.21-r1.ebuild 3519 BLAKE2B 6d428d18831082a16876330751a51a0f9b0f8ddc8360b3c50f359a040f821fe91f50ebcdc3ef5c0a5ee5053e5be23e9db0451eee3d763abb55bd8a620231d6bb SHA512 dfe77397419662fd39e70cca783d53665ce68847180708274a02ac0b879b95d09da92a35bfd0d36ee8bf82af6cb4c343dd7fadb964b749e969a4a037496dfc5b
 MISC metadata.xml 739 BLAKE2B 04fee6f7fd9af83f7e15efcdb84b21af91e44a0af5e257627587d1aa605eb24c1a30fbfdc62b8366e3ecbe984cbc59bbfa373272593e4764e037ed4f71789034 SHA512 1dc7006cc8b01fd81f582bea76ef84fed0ca8490eff2e97a20112f6150d1f4001554ed8363f6d747bb66538bd85c6f3e1ecde9e0a66e52b2a1695ea45547baf4
diff --git a/net-misc/wget/files/wget-1.21-avoid_bashisms.patch b/net-misc/wget/files/wget-1.21-avoid_bashisms.patch
new file mode 100644
index 000000000000..478621ecb594
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21-avoid_bashisms.patch
@@ -0,0 +1,26 @@
+From a9092887e0e98877a205e9052930692f35fb179e Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <gentoo@mattwhitlock.name>
+Date: Sat, 2 Jan 2021 16:27:57 +0100
+Subject: [PATCH] configure.ac: Don't use bashisms
+
+Gentoo-bug: https://bugs.gentoo.org/762946
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96adf13b..f6268fd5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -978,7 +978,7 @@ AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
+ AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"])
+ AM_CONDITIONAL([METALINK_IS_ENABLED], [test "X$with_metalink" != "Xno"])
+ AM_CONDITIONAL([WITH_XATTR], [test "X$ENABLE_XATTR" != "Xno"])
+-AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" == "Xyes"])
++AM_CONDITIONAL([WITH_NTLM], [test "X$ENABLE_NTLM" = "Xyes"])
+ 
+ dnl
+ dnl Create output
+-- 
+2.30.0
+
diff --git a/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch b/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch
new file mode 100644
index 000000000000..0e02851a2577
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21-avoid_eautoreconf.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -55925,7 +55925,7 @@
+   WITH_XATTR_FALSE=
+ fi
+ 
+- if test "X$ENABLE_NTLM" == "Xyes"; then
++ if test "X$ENABLE_NTLM" = "Xyes"; then
+   WITH_NTLM_TRUE=
+   WITH_NTLM_FALSE='#'
+ else
diff --git a/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch
new file mode 100644
index 000000000000..546028c83df0
--- /dev/null
+++ b/net-misc/wget/files/wget-1.21-gnulib-utime-errno.patch
@@ -0,0 +1,30 @@
+From 6a76832db224ac5671599ce332717f985a2addc7 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 31 Dec 2020 17:16:57 +0100
+Subject: utime: Fix compilation error on macOS and Solaris 9 (regr.
+ 2020-12-24).
+
+Reported by Tom G. Christensen <tgc@jupiterrise.com> in
+<https://lists.gnu.org/archive/html/bug-gnulib/2020-12/msg00295.html>.
+
+* lib/utime.c: Include <errno.h>.
+---
+ ChangeLog   | 7 +++++++
+ lib/utime.c | 1 +
+ 2 files changed, 8 insertions(+)
+
+diff --git a/lib/utime.c b/lib/utime.c
+index bf7d7c534..337217950 100644
+--- a/lib/utime.c
++++ b/lib/utime.c
+@@ -261,6 +261,7 @@ utime (const char *name, const struct utimbuf *ts)
+ 
+ #else
+ 
++# include <errno.h>
+ # include <sys/stat.h>
+ # include "filename.h"
+ 
+-- 
+cgit v1.2.1
+
diff --git a/net-misc/wget/wget-1.20.3-r3.ebuild b/net-misc/wget/wget-1.20.3-r3.ebuild
index 8f8647ab77b8..13b6b24cb0d6 100644
--- a/net-misc/wget/wget-1.20.3-r3.ebuild
+++ b/net-misc/wget/wget-1.20.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/wget/wget-1.21.ebuild b/net-misc/wget/wget-1.21-r1.ebuild
index 6034e4a301c6..c8a19550b708 100644
--- a/net-misc/wget/wget-1.21.ebuild
+++ b/net-misc/wget/wget-1.21-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie_check debug gnutls idn ipv6 libressl metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"
@@ -54,6 +54,12 @@ BDEPEND="
 
 DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gnulib-utime-errno.patch  # 763123, drop next release
+	"${FILESDIR}"/${PN}-1.21-avoid_bashisms.patch #762946
+	"${FILESDIR}"/${PN}-1.21-avoid_eautoreconf.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index da3df55bf701..56140a222c32 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -2,9 +2,13 @@ DIST youtube-dl-2020.12.22.tar.gz 3238866 BLAKE2B 8f2f07c59b4d64ed9176bdbfcb858c
 DIST youtube-dl-2020.12.26.tar.gz 3246941 BLAKE2B 7e2c3cea21e10458c1ee3718e9e039301590d8213367229818f36df488865eca7d1e76a27dfc1d4374d15314f271b12fc2c548f43927c724a936399fffa5ac19 SHA512 6a577aa435639af7c5e60183d7548d5f0a74cdea3cb87edaa81dc20ce5ca788ba99f731cbaacffdae74cc10d530e6b8d5b0cfccaf4cb9c2f4cc4f9c540b2d175
 DIST youtube-dl-2020.12.29.tar.gz 3246557 BLAKE2B 94ad5b81e9bfd17a1b05725920dab04f9d2e6e6655cf5df3bd42c443207253251b26f8c969a4baaabce7eb44e4cd2ec04d4ed20ad56569b540f2eba8796da3f9 SHA512 361bb9d60ca1b45887e56d346121412d4a23a7245d2960afdfca55e96d1134ef68126fd1aa5630e6067002de9e704cb70688d12d6e997413f221d28dced4fa81
 DIST youtube-dl-2020.12.31.tar.gz 3252801 BLAKE2B 23b6acffb1d312b628f4c9c485b81645f679df7c0d40649acca665bc524115e81d842d9e336145d65ca8d6e4217f46f4a6fee8dfa48c11fa0316af2a069a68ce SHA512 78c69648f40c99581a533bac0e1afa2339f5681a01278f9234ad8b6b3f0f1b29e21bb669d27d0a6f9bccae0e3be954b571261d1ab9a1e778f3f028c8795595b6
-EBUILD youtube-dl-2020.12.22.ebuild 2142 BLAKE2B 4a7789bdb4c1d590b52f1fdd2207e862d87fddc578ed4b866dc87cc4ca93e07c1def53a9a163d3519508d43dd706d446db69a4c50cb1934164743c4773ab73d9 SHA512 2bae53cca197e3cdf670d38551d643ff6e8285ff852b8d4723bb85d1d151085712f9e90b9f2e7d67e182f20a36c9cec27df7f490f0c4e7da0fd2ce205af2cda8
-EBUILD youtube-dl-2020.12.26.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
-EBUILD youtube-dl-2020.12.29.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
-EBUILD youtube-dl-2020.12.31.ebuild 2147 BLAKE2B d2758deb69b6c5506a58b425e0e77fe7e84daf8fb245634b49fd45096b06ce0350441eeb76855edbd1f0a94f45a3646098f28b977c639c4d4a5c185c1a8f9457 SHA512 3ca31b7f03ef50f58ea77d0338ca65b62e33879edfabab5da1b04acd239db3e101aadc02de379c90605f56e8548443afec289cacb96150bc3e3d7f6e92bcb313
+DIST youtube-dl-2021.01.03.tar.gz 3258305 BLAKE2B faebd2ad58b434b6c34d8ede40f5b095acfa123db306881dce4b78f7d144bd76de7d45cc248ad09bcfe86b5930db6a8f69fbdaca5b62b4942ce6c6b004c791f1 SHA512 2698e91bb176e79c3c8d621e835f58523099b7d2b3aea33df01c6f692ce68b02df12884dc276111e53296db2f284f7ac24603302e35f4e10852a1ec9ec9abd18
+DIST youtube-dl-2021.01.08.tar.gz 3270591 BLAKE2B 7be0b80a80943360ed0b3385921bc4a42c9d5cbb92d5d11f159c0b374a0c86798b14f635e8d31c16aa690f736a14d6c11369b10e42722fd7b5b7a5fdca182196 SHA512 516c5ac6e0e4513e574771a9d39f643f077e18b408dc7b709b92ca99d2d72f15719b545d5f7598a3a1d5eaeae52efff283c42001ce8c846c019582490be8cac1
+EBUILD youtube-dl-2020.12.22.ebuild 2131 BLAKE2B 9b7c85878f0260e8df0b3cb11654f9f1d80cd3a2dc93c5fad50b35cc18f89369cfe5cefeaa7461e0e34d005195f01a85c3c6c13db375bd5c3518bba410cbc23d SHA512 2b55a07be0dd75e9b5ca14ad58d466304727ef50cc8b622c04ef42e0164073ced817d7f7bdf1cfd315794e5e13390fb3e47f4e88d5496f4ea8df24e30155945c
+EBUILD youtube-dl-2020.12.26.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
+EBUILD youtube-dl-2020.12.29.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
+EBUILD youtube-dl-2020.12.31.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
+EBUILD youtube-dl-2021.01.03.ebuild 2131 BLAKE2B 9b7c85878f0260e8df0b3cb11654f9f1d80cd3a2dc93c5fad50b35cc18f89369cfe5cefeaa7461e0e34d005195f01a85c3c6c13db375bd5c3518bba410cbc23d SHA512 2b55a07be0dd75e9b5ca14ad58d466304727ef50cc8b622c04ef42e0164073ced817d7f7bdf1cfd315794e5e13390fb3e47f4e88d5496f4ea8df24e30155945c
+EBUILD youtube-dl-2021.01.08.ebuild 2136 BLAKE2B ca2ebdc11f14acc9d57bf95b725ac45027942aa92c8b60c0f6d5cb5a7d90c511e4c11cb82845b067963ec6f635b3d8ad5564f639af9984964cf605d4b7bb2785 SHA512 fc56dae6b52494f0eb8c8cf00bf1331c64a857628d86881846e5a89544d6d0ea4d7b2ac5c9cadb6c9169b3ec5fd3479d34be6b487b8d00efe4b53b119f97256a
 EBUILD youtube-dl-9999.ebuild 2074 BLAKE2B 7eb91fceeba248ff2a1b40ab97139da9a33211b2fe79c66ae6aa29a2b6fe1f2b4e400f4dcc655573d46b6fa9a7f3cb7baddc75a32739b89507db9d4f4f96eba3 SHA512 f9768251f05033b9df5a0ea82d9e62f6d8fcf651dbbcf72a300bba4caf22ca5b99af73b830eba2d5483ae9b227d99f02bfa015319303f7f7300e6106f1e0b342
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild
index 069b09017f66..532cbacccf05 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild
index 04afa74ada09..9d465c616942 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild
index 04afa74ada09..9d465c616942 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild
index 04afa74ada09..9d465c616942 100644
--- a/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 
 LICENSE="public-domain"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 
 RDEPEND="
diff --git a/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild
new file mode 100644
index 000000000000..532cbacccf05
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2021.01.03.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	doman youtube-dl.1
+
+	newbashcomp youtube-dl.bash-completion youtube-dl
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "youtube-dl works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+	elog "On some sites - most notably YouTube - videos can be retrieved in"
+	elog "a higher quality format without sound. youtube-dl will detect whether"
+	elog "ffmpeg is present and automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want youtube-dl 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-2021.01.08.ebuild b/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild
new file mode 100644
index 000000000000..9d465c616942
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2021.01.08.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	doman youtube-dl.1
+
+	newbashcomp youtube-dl.bash-completion youtube-dl
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "youtube-dl works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+	elog "On some sites - most notably YouTube - videos can be retrieved in"
+	elog "a higher quality format without sound. youtube-dl will detect whether"
+	elog "ffmpeg is present and automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /net-misc
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)